- fixed libtool problem (regenerate ac/am/lt using fixed libtool)

- added nolibs patch to avoid -lnsl, removed some unneeded files/symlinks

Changed files:
    GNUnet.spec -> 1.7

diff --git a/GNUnet.spec b/GNUnet.spec
index 3ccbdbfc8a99236d4fc9fbf976398205726acec6..e99e8a5a65373158adf13eba917f44366e374a22 100644 (file)
--- a/GNUnet.spec
+++ b/GNUnet.spec
@@ -8,7 +8,19 @@ License:       GPL
 Source0:       http://www.ovmj.org/GNUnet/download/%{name}-%{version}.tar.gz
 # Source0-md5: 0a22cadab0b33784d0d5344ce975a088
 Source1:       gnunet.init
+Patch0:                %{name}-nolibs.patch
 URL:           http://www.gnu.org/software/GNUnet/
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake
+BuildRequires: db-devel
+BuildRequires: gdbm-devel
+BuildRequires: gtk+-devel >= 1.2
+BuildRequires: libextractor-devel >= 0.2.3
+BuildRequires: libltdl-devel
+BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: mysql-devel >= 3.23.56
+BuildRequires: openssl-devel >= 0.9.5
+BuildRequires: tdb-devel
 PreReq:                rc-scripts
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
@@ -22,20 +34,8 @@ Requires:    gdbm
 Requires:      gtk+ >= 1.2
 Requires:      libextractor >= 0.2.3
 Requires:      openssl >= 0.9.5
-BuildRequires: gdbm-devel
-BuildRequires: gtk+-devel >= 1.2
-BuildRequires: libextractor-devel >= 0.2.3
-BuildRequires: openssl-devel >= 0.9.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# Note that you can only build this RPM if the current GNUnet version
-# is already installed in /usr. The reason is, that a GNUnet library
-# (afsprotocol) is linked against another couple of libraries which
-# are NOT found in BuildRoot in the "make install" stage when for some
-# odd reason libtool decides to re-link the library :-(. I've spend 6h
-# on this one, there does not seem to be a clean solution.  Note that
-# without the RPM script foo around it, the build works just fine.
-
 %define        _gnunethomedir  /var/lib/GNUnet
 
 %description
@@ -99,13 +99,36 @@ http://www.gnu.org/software/GNUnet/ and http://www.ovmj.org/GNUnet/
 Nale¿y te¿ zauwa¿yæ, ¿e ten pakiet nie wspiera interfejsu bazodanowego
 dla tdb i mysql (a jedynie dla gdbm, bdb i katalogów).
 
+%package bdb
+Summary:       BerkeleyDB database support for GNUnet
+Summary(pl):   Obs³uga bazy BerkeleyDB dla GNUnet
+Group:         Applications/Network
+Requires:      %{name} = %{version}
+
+%description bdb
+This package contains BerkeleyDB database frontend for GNUnet.
+
+%description bdb -l pl
+Pakiet ten zawiera interfejs bazy danych BerkeleyDB dla GNUnet.
+
+%package gdbm
+Summary:       GDBM database support for GNUnet
+Summary(pl):   Obs³uga bazy GDBM dla GNUnet
+Group:         Applications/Network
+Requires:      %{name} = %{version}
+
+%description gdbm
+This package contains GDBM database frontend for GNUnet.
+
+%description gdbm -l pl
+Pakiet ten zawiera interfejs bazy danych GDBM dla GNUnet.
+
 %package mysql
 Summary:       MySQL database support for GNUnet
 Summary(pl):   Obs³uga bazy MySQL dla GNUnet
 Group:         Applications/Network
 Requires:      %{name} = %{version}
 Requires:      mysql-libs >= 3.23.56
-BuildRequires: mysql-devel >= 3.23.56
 
 %description mysql
 This package contains MySQL database frontend for GNUnet.
@@ -113,46 +136,55 @@ This package contains MySQL database frontend for GNUnet.
 %description mysql -l pl
 Pakiet ten zawiera interfejs bazy danych MySQL dla GNUnet.
 
-#%package tdb
-#Summary:      TDB database support for GNUnet
-#Summary(pl):  Obs³uga bazy TDB dla GNUnet
-#Group:                Applications/Network
-#Requires:     %{name} = %{version}
+%package tdb
+Summary:       TDB database support for GNUnet
+Summary(pl):   Obs³uga bazy TDB dla GNUnet
+Group:         Applications/Network
+Requires:      %{name} = %{version}
 
-#%description tdb
-#This package contains TDB database frontend for GNUnet.
+%description tdb
+This package contains TDB database frontend for GNUnet.
 
-#%description tdb -l pl
-#Pakiet ten zawiera interfejs bazy danych TDB dla GNUnet.
+%description tdb -l pl
+Pakiet ten zawiera interfejs bazy danych TDB dla GNUnet.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q
+%patch -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+       --disable-static \
        --with-gdbm=/usr \
        --with-mysql=/usr \
        --with-tdb=/usr \
        --with-crypto=/usr
+# no --enable-ipv6  -- some files missing
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-rm -f $RPM_BUILD_ROOT/usr/lib/*.a
-#rm -f $RPM_BUILD_ROOT/usr/lib/*_tdb.*
-rm -f $RPM_BUILD_ROOT/usr/lib/*.a
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp contrib/gnunet.conf.root $RPM_BUILD_ROOT%{_sysconfdir}/gnunet.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.gnunet/
-cp contrib/gnunet.conf $RPM_BUILD_ROOT%{_sysconfdir}/skel/.gnunet/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/gnunet
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+install -D contrib/gnunet.conf.root $RPM_BUILD_ROOT%{_sysconfdir}/gnunet.conf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.gnunet
+install contrib/gnunet.conf $RPM_BUILD_ROOT%{_sysconfdir}/skel/.gnunet
+install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/gnunet
 install -d $RPM_BUILD_ROOT%{_gnunethomedir}/data/hosts
 install -d $RPM_BUILD_ROOT%{_gnunethomedir}/afs
 
+# these are normal, dynamically linked libraries - there is no -devel, so *.la not needed
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgnunetafs_{blocks,database,decoding,delete,encoding,policy,search,util}.la \
+       $RPM_BUILD_ROOT%{_libdir}/libgnunet{common,util}.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -166,7 +198,7 @@ else
        /usr/sbin/groupadd -g 115 -r -f gnunet
 fi
 if [ -n "`id -u gnunet 2>/dev/null`" ]; then
-       if [ "`id -u gnunet`" != "89" ]; then
+       if [ "`id -u gnunet`" != "115" ]; then
                echo "Error: user gnunet doesn't have uid=115. Correct this before installing GNUnet." 1>&2
                exit 1
        fi
@@ -216,97 +248,48 @@ fi
 %attr(755,root,root) %{_bindir}/gnunet-tbench
 %attr(755,root,root) %{_bindir}/gnunet-peer-info
 %attr(755,root,root) %{_bindir}/gnunet-tracekit
-%{_libdir}/libextractor_lower.la
-%{_libdir}/libextractor_lower.so
-%{_libdir}/libextractor_lower.so.0
-%attr(755,root,root) %{_libdir}/libextractor_lower.so.0.0.0
-%{_libdir}/libgnunetafs_blocks.la
-%{_libdir}/libgnunetafs_blocks.so
-%{_libdir}/libgnunetafs_blocks.so.0
+
+# normal, dynamically linked libraries
 %attr(755,root,root) %{_libdir}/libgnunetafs_blocks.so.0.0.0
-%{_libdir}/libgnunetafs_database.la
-%{_libdir}/libgnunetafs_database.so
-%{_libdir}/libgnunetafs_database.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_database.so.0.0.0
-%{_libdir}/libgnunetafs_database_bdb.la
-%{_libdir}/libgnunetafs_database_bdb.so
-%{_libdir}/libgnunetafs_database_bdb.so.0
-%attr(755,root,root) %{_libdir}/libgnunetafs_database_bdb.so.0.0.0
-%{_libdir}/libgnunetafs_database_gdbm.la
-%{_libdir}/libgnunetafs_database_gdbm.so
-%{_libdir}/libgnunetafs_database_gdbm.so.0
-%attr(755,root,root) %{_libdir}/libgnunetafs_database_gdbm.so.0.0.0
-%{_libdir}/libgnunetafs_database_directory.la
-%{_libdir}/libgnunetafs_database_directory.so
-%{_libdir}/libgnunetafs_database_directory.so.0
-%attr(755,root,root) %{_libdir}/libgnunetafs_database_directory.so.0.0.0
-%{_libdir}/libgnunetafs_decoding.la
-%{_libdir}/libgnunetafs_decoding.so
-%{_libdir}/libgnunetafs_decoding.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_decoding.so.0.0.0
-%{_libdir}/libgnunetafs_delete.la
-%{_libdir}/libgnunetafs_delete.so
-%{_libdir}/libgnunetafs_delete.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_delete.so.0.0.0
-%{_libdir}/libgnunetafs_encoding.la
-%{_libdir}/libgnunetafs_encoding.so
-%{_libdir}/libgnunetafs_encoding.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_encoding.so.0.0.0
-%{_libdir}/libgnunetafs_policy.la
-%{_libdir}/libgnunetafs_policy.so
-%{_libdir}/libgnunetafs_policy.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_policy.so.0.0.0
-%{_libdir}/libgnunetafs_protocol.la
-%{_libdir}/libgnunetafs_protocol.so
-%{_libdir}/libgnunetafs_protocol.so.0
-%attr(755,root,root) %{_libdir}/libgnunetafs_protocol.so.0.0.0
-%{_libdir}/libgnunetafs_search.la
-%{_libdir}/libgnunetafs_search.so
-%{_libdir}/libgnunetafs_search.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_search.so.0.0.0
-%{_libdir}/libgnunetafs_util.la
-%{_libdir}/libgnunetafs_util.so
-%{_libdir}/libgnunetafs_util.so.0
 %attr(755,root,root) %{_libdir}/libgnunetafs_util.so.0.0.0
-%{_libdir}/libgnunetchat_protocol.la
-%{_libdir}/libgnunetchat_protocol.so
-%{_libdir}/libgnunetchat_protocol.so.0
-%attr(755,root,root) %{_libdir}/libgnunetchat_protocol.so.0.0.0
-%{_libdir}/libgnunetcommon.la
-%{_libdir}/libgnunetcommon.so
-%{_libdir}/libgnunetcommon.so.0
 %attr(755,root,root) %{_libdir}/libgnunetcommon.so.0.0.0
-%{_libdir}/libgnunettbench_protocol.la
-%{_libdir}/libgnunettbench_protocol.so
-%{_libdir}/libgnunettbench_protocol.so.0
+%attr(755,root,root) %{_libdir}/libgnunetutil.so.0.0.0
+
+# ltdlopened plugins - these must have *.la
+%attr(755,root,root) %{_libdir}/libextractor_lower.so.0.0.0
+%{_libdir}/libextractor_lower.la
+%attr(755,root,root) %{_libdir}/libgnunetafs_database_directory.so.0.0.0
+%{_libdir}/libgnunetafs_database_directory.la
+%attr(755,root,root) %{_libdir}/libgnunetafs_protocol.so.0.0.0
+%{_libdir}/libgnunetafs_protocol.la
+%attr(755,root,root) %{_libdir}/libgnunetchat_protocol.so.0.0.0
+%{_libdir}/libgnunetchat_protocol.la
 %attr(755,root,root) %{_libdir}/libgnunettbench_protocol.so.0.0.0
-%{_libdir}/libgnunettracekit_protocol.la
-%{_libdir}/libgnunettracekit_protocol.so
-%{_libdir}/libgnunettracekit_protocol.so.0
+%{_libdir}/libgnunettbench_protocol.la
 %attr(755,root,root) %{_libdir}/libgnunettracekit_protocol.so.0.0.0
-%{_libdir}/libgnunettransport_smtp.la
-%{_libdir}/libgnunettransport_smtp.so
-%{_libdir}/libgnunettransport_smtp.so.0
+%{_libdir}/libgnunettracekit_protocol.la
 %attr(755,root,root) %{_libdir}/libgnunettransport_smtp.so.0.0.0
-%{_libdir}/libgnunettransport_http.la
-%{_libdir}/libgnunettransport_http.so
-%{_libdir}/libgnunettransport_http.so.0
+%{_libdir}/libgnunettransport_smtp.la
 %attr(755,root,root) %{_libdir}/libgnunettransport_http.so.0.0.0
-%{_libdir}/libgnunettransport_tcp.la
-%{_libdir}/libgnunettransport_tcp.so
-%{_libdir}/libgnunettransport_tcp.so.0
+%{_libdir}/libgnunettransport_http.la
 %attr(755,root,root) %{_libdir}/libgnunettransport_tcp.so.0.0.0
-%{_libdir}/libgnunettransport_udp.la
-%{_libdir}/libgnunettransport_udp.so
-%{_libdir}/libgnunettransport_udp.so.0
+%{_libdir}/libgnunettransport_tcp.la
+#%attr(755,root,root) %{_libdir}/libgnunettransport_tcp6.so.0.0.0
+#%{_libdir}/libgnunettransport_tcp6.la
 %attr(755,root,root) %{_libdir}/libgnunettransport_udp.so.0.0.0
-%{_libdir}/libgnunetutil.la
-%{_libdir}/libgnunetutil.so
-%{_libdir}/libgnunetutil.so.0
-%attr(755,root,root) %{_libdir}/libgnunetutil.so.0.0.0
+%{_libdir}/libgnunettransport_udp.la
+#%attr(755,root,root) %{_libdir}/libgnunettransport_udp6.so.0.0.0
+#%{_libdir}/libgnunettransport_udp6.la
+
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/gnunet.conf
 %{_sysconfdir}/skel/.gnunet
-%attr(755,root,root) /etc}/rc.d/init.d/gnunet
+%attr(754,root,root) /etc/rc.d/init.d/gnunet
 %{_mandir}/man1/gnunetd.1*
 %{_mandir}/man1/gnunet-convert.1*
 %{_mandir}/man1/gnunet-gtk.1*
@@ -328,10 +311,34 @@ fi
 %attr(2770,gnunet,gnunet) %dir %{_gnunethomedir}/data
 %attr(2770,gnunet,gnunet) %dir %{_gnunethomedir}/data/hosts
 
+# these (and *.so for them) should be in -devel or /dev/null
+#%{_libdir}/libgnunetafs_blocks.la
+#%{_libdir}/libgnunetafs_database.la
+#%{_libdir}/libgnunetafs_decoding.la
+#%{_libdir}/libgnunetafs_delete.la
+#%{_libdir}/libgnunetafs_encoding.la
+#%{_libdir}/libgnunetafs_policy.la
+#%{_libdir}/libgnunetafs_search.la
+#%{_libdir}/libgnunetafs_util.la
+#%{_libdir}/libgnunetcommon.la
+#%{_libdir}/libgnunetutil.la
+
+%files bdb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnunetafs_database_bdb.so.0.0.0
+%{_libdir}/libgnunetafs_database_bdb.la
+
+%files gdbm
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnunetafs_database_gdbm.so.0.0.0
+%{_libdir}/libgnunetafs_database_gdbm.la
+
 %files mysql
 %defattr(644,root,root,755)
-%{_libdir}/libgnunetafs_database_mysql.*
+%attr(755,root,root) %{_libdir}/libgnunetafs_database_mysql.so.0.0.0
+%{_libdir}/libgnunetafs_database_mysql.la
 
-#%files tdb
-#%defattr(644,root,root,755)
-#%{_libdir}/libgnunetafs_database_tdb.*
+%files tdb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnunetafs_database_tdb.so.0.0.0
+%{_libdir}/libgnunetafs_database_tdb.la