diff --git a/rpm-gcc43.diff b/rpm-gcc43.diff new file mode 100644 index 0000000..364795a --- /dev/null +++ b/rpm-gcc43.diff @@ -0,0 +1,20 @@ +--- elfutils-0.97/libelf/common.h.orig 2007-09-25 11:34:29.000000000 +0200 ++++ elfutils-0.97/libelf/common.h 2007-09-25 11:36:54.000000000 +0200 +@@ -78,7 +78,7 @@ + + + /* Acquire lock for the descriptor and all children. */ +-static void ++static inline void + libelf_acquire_all (Elf *elf) + { + rwlock_wrlock (elf->lock); +@@ -97,7 +97,7 @@ + } + + /* Release own lock and those of the children. */ +-static void ++static inline void + libelf_release_all (Elf *elf) + { + if (elf->kind == ELF_K_AR) diff --git a/rpm-python.spec b/rpm-python.spec index 3e12b0f..ad204d7 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -16,9 +16,8 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 159 +Release: 165 Requires: rpm = %{version} - %py_requires Source99: rpm.spec %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)} @@ -60,7 +59,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_libdir}/python* - %changelog * Fri May 25 2007 - mls@suse.de - fix unicode queries diff --git a/rpm.changes b/rpm.changes index b3b39f7..f698997 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 30 18:28:23 CEST 2007 - rguenther@suse.de + +- fix build with gcc43 + ------------------------------------------------------------------- Mon Sep 3 13:27:57 CEST 2007 - dmueller@suse.de diff --git a/rpm.spec b/rpm.spec index 486cdd5..f434401 100644 --- a/rpm.spec +++ b/rpm.spec @@ -17,10 +17,10 @@ BuildRequires: libbz2-devel ncurses-devel zlib-devel Provides: rpminst %define popt_version 1.7 PreReq: %insserv_prereq %fillup_prereq permissions -Autoreqprov: on +AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 137 +Release: 141 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -125,6 +125,7 @@ Patch96: tarwildcards.diff Patch97: perlprov.diff Patch98: showtransscripts.diff Patch99: rpm-debugedit-shared.diff +Patch100: rpm-gcc43.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -195,6 +196,7 @@ rm -f rpmdb/db.h %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89 %patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99 +%patch -P 100 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms tar -xjvf %{SOURCE1} @@ -299,7 +301,6 @@ fi %postun %{insserv_cleanup} - %verifyscript %verify_permissions -f /usr/lib/rpm/permlist @@ -336,12 +337,13 @@ fi %{_libdir}/librpmbuild.so %{_libdir}/librpmdb.so %{_libdir}/librpmio.so + %package -n popt Summary: A C library for parsing command line parameters License: LGPL v2 or later Group: System/Libraries Version: 1.7 -Release: 365 +Release: 369 # %description -n popt @@ -364,7 +366,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2 or later Group: System/Libraries Version: 1.7 -Release: 365 +Release: 369 Requires: popt = 1.7 Requires: glibc-devel @@ -383,7 +385,6 @@ Authors: -------- Erik Troan - %post -n popt -p /sbin/ldconfig %postun -n popt -p /sbin/ldconfig @@ -398,8 +399,9 @@ Authors: /usr/include/popt.h /%{_lib}/libpopt.so %doc %{_mandir}/man3/popt.3* - %changelog +* Sun Sep 30 2007 - rguenther@suse.de +- fix build with gcc43 * Mon Sep 03 2007 - dmueller@suse.de - change %%lang_package implementation once again to support bundle-lang-other for only one desktop (#302270)