Hello community, here is the log from the commit of package rpm checked in at Fri Mar 23 17:13:49 CET 2007. -------- --- rpm/rpm.changes 2007-03-22 19:44:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-03-23 16:15:54.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 23 16:14:28 CET 2007 - dmueller@suse.de + +- drop custom libpopt so versioning +- move libpopt to /lib(64) for cryptsetup +- adjust installed libtool files +- Fix rpm buildrequires / devel requires + +------------------------------------------------------------------- Old: ---- popt-so-version.diff New: ---- popt-to-lib.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.O28252/_old 2007-03-23 17:13:34.000000000 +0100 +++ /var/tmp/diff_new_pack.O28252/_new 2007-03-23 17:13:34.000000000 +0100 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 97 +Release: 98 Requires: rpm = %{version} %py_requires ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.O28252/_old 2007-03-23 17:13:34.000000000 +0100 +++ /var/tmp/diff_new_pack.O28252/_new 2007-03-23 17:13:34.000000000 +0100 @@ -13,13 +13,14 @@ Name: rpm License: GNU General Public License (GPL) Group: System/Packages +BuildRequires: ncurses-devel zlib-devel Provides: rpminst %define popt_version 1.7 PreReq: %insserv_prereq %fillup_prereq popt = %{popt_version} permissions Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 90 +Release: 91 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -116,9 +117,9 @@ Patch88: modalias-kernel_module.diff Patch89: querybuffer.diff Patch90: testmode.diff -Patch91: popt-so-version.diff -Patch92: po-file-fixes.diff -Patch93: files.diff +Patch91: po-file-fixes.diff +Patch92: files.diff +Patch93: popt-to-lib.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -143,7 +144,7 @@ License: GNU General Public License (GPL) Group: System/Packages Requires: rpm = %{version} -Requires: popt-devel +Requires: popt-devel zlib-devel bzip2 %description devel This package contains the RPM C library and header files. These @@ -225,7 +226,12 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/locale ln -s ../share/locale $RPM_BUILD_ROOT/usr/lib/locale make DESTDIR="$RPM_BUILD_ROOT" install -rm -f $RPM_BUILD_ROOT/%_libdir/libpopt.a $RPM_BUILD_ROOT/%_libdir/libpopt.la +# remove .la file and the static variant of libpopt +# have to remove the dependency from other .la files as well +rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a $RPM_BUILD_ROOT/%_lib/libpopt.la +for f in $RPM_BUILD_ROOT/%{_libdir}/*.la; do + sed -i -e "s,/%_lib/libpopt.la,-lpopt,g" $f +done mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/usr/sbin @@ -314,7 +320,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 318 +Release: 319 # %description -n popt @@ -337,7 +343,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 318 +Release: 319 Requires: popt = 1.7 Requires: glibc-devel @@ -363,16 +369,21 @@ %files -n popt %defattr(-,root,root) - %{_libdir}/libpopt.so.* + /%{_lib}/libpopt.so.* /usr/share/locale/*/LC_MESSAGES/popt.mo %files -n popt-devel %defattr(644,root,root,755) /usr/include/popt.h - %{_libdir}/libpopt.so + /%{_lib}/libpopt.so %doc %{_mandir}/man3/popt.3* %changelog +* Fri Mar 23 2007 - dmueller@suse.de +- drop custom libpopt so versioning +- move libpopt to /lib(64) for cryptsetup +- adjust installed libtool files +- Fix rpm buildrequires / devel requires * Thu Mar 22 2007 - stbinner@suse.de - files.diff: when checking %%files list also show unpackaged files after "not found" error message [#255780] ++++++ popt-to-lib.diff ++++++ diff -u popt/Makefile.am popt/Makefile.am --- popt/Makefile.am +++ popt/Makefile.am @@ -18,13 +18,13 @@ noinst_PROGRAMS = test1 test2 test3 test1_SOURCES = test1.c test1_LDFLAGS = -test1_LDADD = $(usrlib_LTLIBRARIES) +test1_LDADD = $(popt_LTLIBRARIES) test2_SOURCES = test2.c test2_LDFLAGS = -test2_LDADD = $(usrlib_LTLIBRARIES) +test2_LDADD = $(popt_LTLIBRARIES) test3_SOURCES = test3.c test3_LDFLAGS = -test3_LDADD = $(usrlib_LTLIBRARIES) +test3_LDADD = $(popt_LTLIBRARIES) noinst_SCRIPTS = testit.sh @@ -35,8 +35,8 @@ include_HEADERS = popt.h -usrlibdir = $(libdir)@MARK64@ -usrlib_LTLIBRARIES = libpopt.la +poptdir = /lib@MARK64@ +popt_LTLIBRARIES = libpopt.la libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c libpopt_la_LDFLAGS = @INTLLIBS@ -version-info 8:0:7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org