[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [leafnode-list] Re: Building RPM for leafnode-2
Daniel Zwick schrieb am 2004-01-17:
> I am now getting the following:
>
> RPM build errors:
> Installed (but unpackaged) file(s) found:
> /etc/uucp
> /usr/sbin/sendbatch.bash
Ok, packaging problem. Next round of updates.
Please try the attached patch (if nothing helps, unpack the tarball to
an empty directory first) - ./configure && make rpm (you may have to
tweak Makefile variables)
Use "patch -Z" if you have GNU patch.
--
Matthias Andree
Encrypt your mail: my GnuPG key ID is 0x052E7D95
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/ChangeLog leafnode-2.0.0.alpha20040116a/ChangeLog
--- /tmp/leafnode-2.0.0.alpha20040116a/ChangeLog 2004-01-16 22:43:45.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/ChangeLog 2004-01-17 03:52:48.000000000 +0000
@@ -1,5 +1,17 @@
+2004-01-17 Matthias Andree <matthias.andree@xxxxxx>
+
+ * leafnode.spec.in:
+ List uucp and sendbatch.bash in %files. Reported by Daniel Zwick.
+ * configure.ac: Clean up sysconfdir handling. Add GCC flags to
+ CFLAGS.
+ * Makefile.am: Clean up.
+
2004-01-16 Matthias Andree <matthias.andree@xxxxxx>
+ * leafnode.spec.in: Update.
+ * ChangeLog, NEWS, configure.ac: Release 20040116a.
+
+ = snapshot 20040116a =
* Makefile.am, genconfigdefs.awk, genconfigparam_data.awk: Makefile
cleanup. Do not ship AWK-generated files.
* b_sortnl.c: Quench compiler warnings in SPARC64.
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/Makefile.am leafnode-2.0.0.alpha20040116a/Makefile.am
--- /tmp/leafnode-2.0.0.alpha20040116a/Makefile.am 2004-01-16 21:46:44.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/Makefile.am 2004-01-17 03:50:29.000000000 +0000
@@ -1,23 +1,10 @@
# -*- makefile -*-
# @configure_input@
-# $Id: Makefile.am,v 1.54 2004/01/16 21:46:44 emma Exp $
+# $Id: Makefile.am,v 1.55 2004/01/17 03:50:29 emma Exp $
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-installinfo 1.6 # check-news
SUBDIRS = tools
-VPATH = $(srcdir)
-
-# external programs
-LYNX = @LYNX@
-
-# external variables
-BINDIR = @bindir@
-SBINDIR = @sbindir@
-sysconfdir = @sysconfdir@/leafnode
-SYSCONFDIR = $(sysconfdir)
-VERSION = @VERSION@
-
-CFLAGS = @CFLAGS@ @GCC_FLAGS@
sysconf_DATA = config.example \
filters.example
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/Makefile.in leafnode-2.0.0.alpha20040116a/Makefile.in
--- /tmp/leafnode-2.0.0.alpha20040116a/Makefile.in 2004-01-16 22:52:25.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/Makefile.in 2004-01-17 03:54:58.000000000 +0000
@@ -16,7 +16,7 @@
# -*- makefile -*-
# @configure_input@
-# $Id: Makefile.am,v 1.54 2004/01/16 21:46:44 emma Exp $
+# $Id: Makefile.am,v 1.55 2004/01/17 03:50:29 emma Exp $
@@ -24,6 +24,7 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
+VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -282,7 +283,6 @@
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
-VPATH = $(srcdir)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -295,7 +295,7 @@
BZIP2 = @BZIP2@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @GCC_FLAGS@
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -307,7 +307,6 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCC_FLAGS = @GCC_FLAGS@
GZIP = @GZIP@
ID = @ID@
INSTALL_DATA = @INSTALL_DATA@
@@ -319,8 +318,6 @@
LIBS = @LIBS@
LINKPCRELIB = @LINKPCRELIB@
LTLIBOBJS = @LTLIBOBJS@
-
-# external programs
LYNX = @LYNX@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
@@ -372,15 +369,10 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@/leafnode
+sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-installinfo 1.6 # check-news
SUBDIRS = tools
-
-# external variables
-BINDIR = @bindir@
-SBINDIR = @sbindir@
-SYSCONFDIR = $(sysconfdir)
sysconf_DATA = config.example \
filters.example
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/NEWS leafnode-2.0.0.alpha20040116a/NEWS
--- /tmp/leafnode-2.0.0.alpha20040116a/NEWS 2004-01-16 22:55:56.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/NEWS 2004-01-17 03:54:06.000000000 +0000
@@ -1,3 +1,8 @@
+Changes since 20040116a:
+- Update: the spec file was outdated. Reported by Daniel Zwick.
+- Cleanup: Internal Makefile.am and configure.ac cleanup. Watch for
+ changes in the response to --prefix and/or --sysconfdir options.
+
20040116a: Changes since 20040108a:
- Bugfix: LIST NEWSGROUPS/LIST ACTIVE crashed when a non-existent group
argument was given that was not a pattern. Patch by Hans-Jürgen
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/configure leafnode-2.0.0.alpha20040116a/configure
--- /tmp/leafnode-2.0.0.alpha20040116a/configure 2004-01-16 22:53:00.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/configure 2004-01-17 03:55:11.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.84 .
+# From configure.ac Revision: 1.85 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -311,7 +311,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ID RANLIB ac_ct_RANLIB AR ac_ct_AR LYNX RPM GZIP BZIP2 SED DEFAULTMTA GCC_FLAGS RUNAS_USER RUNAS_GROUP CPP EGREP SPOOLDIR RPMSRC PCRECONFIG PCRELIB LINKPCRELIB LIBOBJS PCRE_DEFINES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ID RANLIB ac_ct_RANLIB AR ac_ct_AR LYNX RPM GZIP BZIP2 SED DEFAULTMTA RUNAS_USER RUNAS_GROUP CPP EGREP SPOOLDIR RPMSRC PCRECONFIG PCRELIB LINKPCRELIB LIBOBJS PCRE_DEFINES LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -4491,7 +4491,8 @@
echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_flags" >&5
echo "${ECHO_T}$ac_cv_prog_gcc_flags" >&6
rm -f configure-dummy.c configure-dummy.o
-GCC_FLAGS=$ac_cv_prog_gcc_flags
+CFLAGS="$CFLAGS $ac_cv_prog_gcc_flags"
+export CFLAGS
echo "$as_me:$LINENO: checking runas-user" >&5
@@ -6711,16 +6712,15 @@
echo "${ECHO_T}$SPOOLDIR" >&6
-echo "$as_me:$LINENO: checking confdir" >&5
-echo $ECHO_N "checking confdir... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking sysconfdir" >&5
+echo $ECHO_N "checking sysconfdir... $ECHO_C" >&6
if test "x$sysconfdir" = 'x${prefix}/etc' \
-a "(" "x$prefix" = xNONE -o "x$prefix" = "x/usr" ")" ; then
- CONFDIR='/etc'
+ CONFDIR='/etc/leafnode'
else
case "$sysconfdir" in
- */leafnode) CONFDIR=${sysconfdir%%/leafnode} ;;
- */leafnode/) CONFDIR=${sysconfdir%%/leafnode/} ;;
- *) CONFDIR="$sysconfdir" ;;
+ */) CONFDIR="${sysconfdir%%/}" ;;
+ *) CONFDIR="${sysconfdir}" ;;
esac
fi
echo "$as_me:$LINENO: result: $CONFDIR" >&5
@@ -6735,10 +6735,8 @@
{ echo "$as_me:$LINENO: WARNING: the default autoconf behaviour" >&5
echo "$as_me: WARNING: the default autoconf behaviour" >&2;}
fi
-sysconfdir=$CONFDIR
+sysconfdir="$CONFDIR"
-{ echo "$as_me:$LINENO: note that \"leafnode\" is automatically appended to $sysconfdir" >&5
-echo "$as_me: note that \"leafnode\" is automatically appended to $sysconfdir" >&6;}
echo "$as_me:$LINENO: checking rpm build dir" >&5
echo $ECHO_N "checking rpm build dir... $ECHO_C" >&6
@@ -9119,7 +9117,6 @@
echo "=== configuration summary: ("NONE" is ok here and means the default) ==="
printf "prefix: " ; eval echo "$prefix"
printf "sysconfdir: " ; eval echo "$sysconfdir"
- printf " " ; echo 'note that "leafnode" is automatically appended to sysconfdir'
printf "spooldir: " ; eval echo "$SPOOLDIR"
printf "RUNAS_USER: " ; eval echo "$RUNAS_USER"
printf "RUNAS_GROUP: " ; eval echo "$RUNAS_GROUP"
@@ -9830,7 +9827,6 @@
s,@BZIP2@,$BZIP2,;t t
s,@SED@,$SED,;t t
s,@DEFAULTMTA@,$DEFAULTMTA,;t t
-s,@GCC_FLAGS@,$GCC_FLAGS,;t t
s,@RUNAS_USER@,$RUNAS_USER,;t t
s,@RUNAS_GROUP@,$RUNAS_GROUP,;t t
s,@CPP@,$CPP,;t t
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/configure.ac leafnode-2.0.0.alpha20040116a/configure.ac
--- /tmp/leafnode-2.0.0.alpha20040116a/configure.ac 2004-01-16 22:46:40.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/configure.ac 2004-01-17 03:50:50.000000000 +0000
@@ -6,7 +6,7 @@
AC_CONFIG_SRCDIR([leafnode.h])
AM_INIT_AUTOMAKE([leafnode],[2.0.0.alpha20040116a])
AC_PREREQ(2.57)
-AC_REVISION($Revision: 1.84 $)
+AC_REVISION($Revision: 1.85 $)
AC_CONFIG_SRCDIR(leafnode.h)
AC_CONFIG_HEADERS([config.h])
dnl AM_MAINTAINER_MODE
@@ -42,8 +42,9 @@
done
fi])
rm -f configure-dummy.c configure-dummy.o
-GCC_FLAGS=$ac_cv_prog_gcc_flags
-AC_SUBST(GCC_FLAGS)
+CFLAGS="$CFLAGS $ac_cv_prog_gcc_flags"
+export CFLAGS
+AC_SUBST(CFLAGS)
dnl check which user to use
AC_MSG_CHECKING(runas-user)
@@ -148,16 +149,15 @@
AC_MSG_RESULT($SPOOLDIR)
AC_SUBST(SPOOLDIR)
-AC_MSG_CHECKING(confdir)
+AC_MSG_CHECKING(sysconfdir)
dnl check where to put the confdir
if test "x$sysconfdir" = 'x${prefix}/etc' \
-a "(" "x$prefix" = xNONE -o "x$prefix" = "x/usr" ")" ; then
- CONFDIR='/etc'
+ CONFDIR='/etc/leafnode'
else
case "$sysconfdir" in
- */leafnode) CONFDIR=${sysconfdir%%/leafnode} ;;
- */leafnode/) CONFDIR=${sysconfdir%%/leafnode/} ;;
- *) CONFDIR="$sysconfdir" ;;
+ */) CONFDIR="${sysconfdir%%/}" ;;
+ *) CONFDIR="${sysconfdir}" ;;
esac
fi
AC_MSG_RESULT($CONFDIR)
@@ -167,9 +167,8 @@
AC_MSG_WARN([use --sysconfdir='\${prefix}/etc' to get])
AC_MSG_WARN([the default autoconf behaviour])
fi
-sysconfdir=$CONFDIR
+sysconfdir="$CONFDIR"
AC_SUBST(sysconfdir)
-AC_MSG_NOTICE(note that "leafnode" is automatically appended to $sysconfdir)
dnl check for rpm build dir
AC_MSG_CHECKING(rpm build dir)
@@ -316,7 +315,6 @@
echo "=== configuration summary: ("NONE" is ok here and means the default) ==="
printf "prefix: " ; eval echo "$prefix"
printf "sysconfdir: " ; eval echo "$sysconfdir"
- printf " " ; echo 'note that "leafnode" is automatically appended to sysconfdir'
printf "spooldir: " ; eval echo "$SPOOLDIR"
printf "RUNAS_USER: " ; eval echo "$RUNAS_USER"
printf "RUNAS_GROUP: " ; eval echo "$RUNAS_GROUP"
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/leafnode.spec leafnode-2.0.0.alpha20040116a/leafnode.spec
--- /tmp/leafnode-2.0.0.alpha20040116a/leafnode.spec 2004-01-16 22:53:18.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/leafnode.spec 2004-01-17 03:55:54.000000000 +0000
@@ -13,8 +13,6 @@
%define prefix /usr
%define spooldir /var/spool/news
%define confdir /etc/leafnode
-%define lockdir /var/lock/news
-%define lockfile %{lockdir}/fetchnews.lck
%define runas_user news
%define runas_group news
@@ -35,14 +33,15 @@
%prep
%setup -q
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --mandir=%_mandir \
- --with-spooldir=%spooldir --silent \
- --sysconfdir=%confdir --with-lockfile=%lockfile \
- --with-runas-user=%{runas_user} --with-runas-group=%{runas_group}
+CFLAGS="$RPM_OPT_FLAGS"
+%configure \
+ --enable-spooldir=%spooldir \
+ --enable-runas-user=%{runas_user} --with-runas-group=%{runas_group} \
+ --sysconfdir=%_sysconfdir/leafnode
%build
-make -s
-make -s check
+make
+make check
%install
# first clean out any prior aborted runs
@@ -58,21 +57,24 @@
%config(noreplace) %attr(640,root,news) %confdir/filters
%attr(640,root,news) %confdir/config.example
%attr(640,root,news) %confdir/filters.example
-%attr(755,root,root) %{prefix}/bin/newsq
+%attr(640,root,news) %confdir/uucp
%attr(755,root,root) %{prefix}/bin/leafnode-version
+%attr(755,root,root) %{prefix}/bin/lsmac.pl
+%attr(755,root,root) %{prefix}/bin/newsq
%attr(755,root,root) %{prefix}/sbin/applyfilter
%attr(755,root,root) %{prefix}/sbin/checkgroups
+%attr(755,root,root) %{prefix}/sbin/fetchnews
%attr(755,root,root) %{prefix}/sbin/leafnode
%attr(755,root,root) %{prefix}/sbin/rnews
-%attr(755,root,root) %{prefix}/sbin/fetchnews
+%attr(755,root,root) %{prefix}/sbin/sendbatch.bash
%attr(755,root,root) %{prefix}/sbin/texpire
-%attr(775,%{runas_user},%{runas_group}) %dir %{lockdir}
%doc %_mandir/man1/*
%doc %_mandir/man5/*
%doc %_mandir/man8/*
-%doc ChangeLog AUTHORS CREDITS FAQ INSTALL README TODO
+%doc ChangeLog AUTHORS COPYING COPYING.LGPL NEWS
+%doc CREDITS DEBUGGING ENVIRONMENT FAQ INSTALL
+%doc README TODO README_FIRST
%doc README.html DEBUGGING
-#%doc tools/*.pl
%attr(2755,%{runas_user},%{runas_group}) %spooldir
%clean
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/leafnode.spec.in leafnode-2.0.0.alpha20040116a/leafnode.spec.in
--- /tmp/leafnode-2.0.0.alpha20040116a/leafnode.spec.in 2003-02-02 12:45:23.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/leafnode.spec.in 2004-01-17 01:47:00.000000000 +0000
@@ -13,8 +13,6 @@
%define prefix /usr
%define spooldir /var/spool/news
%define confdir /etc/leafnode
-%define lockdir /var/lock/news
-%define lockfile %{lockdir}/fetchnews.lck
%define runas_user news
%define runas_group news
@@ -35,14 +33,15 @@
%prep
%setup -q
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --mandir=%_mandir \
- --with-spooldir=%spooldir --silent \
- --sysconfdir=%confdir --with-lockfile=%lockfile \
- --with-runas-user=%{runas_user} --with-runas-group=%{runas_group}
+CFLAGS="$RPM_OPT_FLAGS"
+%configure \
+ --enable-spooldir=%spooldir \
+ --enable-runas-user=%{runas_user} --with-runas-group=%{runas_group} \
+ --sysconfdir=%_sysconfdir/leafnode
%build
-make -s
-make -s check
+make
+make check
%install
# first clean out any prior aborted runs
@@ -58,21 +57,24 @@
%config(noreplace) %attr(640,root,news) %confdir/filters
%attr(640,root,news) %confdir/config.example
%attr(640,root,news) %confdir/filters.example
-%attr(755,root,root) %{prefix}/bin/newsq
+%attr(640,root,news) %confdir/uucp
%attr(755,root,root) %{prefix}/bin/leafnode-version
+%attr(755,root,root) %{prefix}/bin/lsmac.pl
+%attr(755,root,root) %{prefix}/bin/newsq
%attr(755,root,root) %{prefix}/sbin/applyfilter
%attr(755,root,root) %{prefix}/sbin/checkgroups
+%attr(755,root,root) %{prefix}/sbin/fetchnews
%attr(755,root,root) %{prefix}/sbin/leafnode
%attr(755,root,root) %{prefix}/sbin/rnews
-%attr(755,root,root) %{prefix}/sbin/fetchnews
+%attr(755,root,root) %{prefix}/sbin/sendbatch.bash
%attr(755,root,root) %{prefix}/sbin/texpire
-%attr(775,%{runas_user},%{runas_group}) %dir %{lockdir}
%doc %_mandir/man1/*
%doc %_mandir/man5/*
%doc %_mandir/man8/*
-%doc ChangeLog AUTHORS CREDITS FAQ INSTALL README TODO
+%doc ChangeLog AUTHORS COPYING COPYING.LGPL NEWS
+%doc CREDITS DEBUGGING ENVIRONMENT FAQ INSTALL
+%doc README TODO README_FIRST
%doc README.html DEBUGGING
-#%doc tools/*.pl
%attr(2755,%{runas_user},%{runas_group}) %spooldir
%clean
diff -Nur /tmp/leafnode-2.0.0.alpha20040116a/tools/Makefile.in leafnode-2.0.0.alpha20040116a/tools/Makefile.in
--- /tmp/leafnode-2.0.0.alpha20040116a/tools/Makefile.in 2004-01-16 22:52:26.000000000 +0000
+++ leafnode-2.0.0.alpha20040116a/tools/Makefile.in 2004-01-17 03:54:59.000000000 +0000
@@ -81,7 +81,6 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCC_FLAGS = @GCC_FLAGS@
GZIP = @GZIP@
ID = @ID@
INSTALL_DATA = @INSTALL_DATA@
@@ -172,9 +171,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tools/Makefile
+ $(AUTOMAKE) --foreign tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
--
_______________________________________________
leafnode-list mailing list
leafnode-list@xxxxxxxxxxxxxxxxxxxxxxxxxxxx
http://www.dt.e-technik.uni-dortmund.de/mailman/listinfo/leafnode-list
http://leafnode.sourceforge.net/