diff --git a/RPM-Changes.html.tar.bz2 b/RPM-Changes.html.tar.bz2
deleted file mode 100644
index 5cb5122..0000000
--- a/RPM-Changes.html.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b1d6954ea1c3fd4681d1419dbbae6907fac09ac9e8ea8cd33b08e930873e4c2
-size 9527
diff --git a/rpm-debugedit-shared.diff b/rpm-debugedit-shared.diff
new file mode 100644
index 0000000..2210cd5
--- /dev/null
+++ b/rpm-debugedit-shared.diff
@@ -0,0 +1,11 @@
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -40,7 +40,7 @@ convertdb1_LDADD = \
+ @WITH_LIBELF_LIB@
+
+ debugedit_SOURCES = debugedit.c hashtab.c
+-debugedit_LDADD = @LDFLAGS_STATIC@ \
++debugedit_LDADD = \
+ @WITH_LIBELF_LIB@ \
+ @WITH_POPT_LIB@
+
diff --git a/rpm-python.spec b/rpm-python.spec
index f220f30..aedbae6 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -12,11 +12,11 @@
Name: rpm-python
BuildRequires: libbz2-devel ncurses-devel python-devel zlib-devel
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
-Release: 126
+Release: 140
Requires: rpm = %{version}
%py_requires
diff --git a/rpm.changes b/rpm.changes
index 18c2ed2..f017944 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 15 08:30:07 CEST 2007 - dmueller@suse.de
+
+- package size reduction (28%)
+
-------------------------------------------------------------------
Sun May 27 16:43:25 CEST 2007 - schwab@suse.de
diff --git a/rpm.spec b/rpm.spec
index 8a7ec66..2b242f8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -11,7 +11,7 @@
# norootforbuild
Name: rpm
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Packages
BuildRequires: libbz2-devel ncurses-devel zlib-devel
Provides: rpminst
@@ -20,11 +20,10 @@ PreReq: %insserv_prereq %fillup_prereq permissions
Autoreqprov: on
Summary: The RPM Package Manager
Version: 4.4.2
-Release: 112
+Release: 121
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
-Source3: RPM-Changes.html.tar.bz2
Source4: rpm-suse_macros
Source5: rpmsort
Source6: symset-table
@@ -125,6 +124,7 @@ Patch95: pythonunicode.diff
Patch96: tarwildcards.diff
Patch97: perlprov.diff
Patch98: showtransscripts.diff
+Patch99: %{name}-debugedit-shared.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -146,7 +146,7 @@ Authors:
%package devel
Summary: Include Files and Libraries mandatory for Development.
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Packages
Requires: rpm = %{version}
Requires: popt-devel zlib-devel bzip2 libbz2-devel
@@ -194,12 +194,11 @@ rm -f rpmdb/db.h
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
%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
+%patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
tar -xjvf %{SOURCE1}
tar -xjvf %{SOURCE2}
-tar -xjvf %{SOURCE3}
if [ -s /etc/rpm/suse_macros ]; then
cp -a /etc/rpm/suse_macros %{SOURCE4}
fi
@@ -208,7 +207,8 @@ rename no nb po/no.* popt/po/no.*
%build
%{?suse_update_config:%{suse_update_config -f popt}}
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -ffunction-sections"
+export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections"
%ifarch alpha
export CFLAGS="-g -O0 -fno-strict-aliasing"
%endif
@@ -265,6 +265,22 @@ install -m 755 scripts/find-supplements{,.ksyms} $RPM_BUILD_ROOT/usr/lib/rpm
rm -f $RPM_BUILD_ROOT/usr/lib/locale $RPM_BUILD_ROOT/usr/lib/rpmrc
mkdir -p $RPM_BUILD_ROOT/etc/rpm
chmod 755 $RPM_BUILD_ROOT/etc/rpm
+# remove some nonsense or non-working scripts
+pushd $RPM_BUILD_ROOT/usr/lib/rpm/
+for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
+ magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
+ brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
+ rpmdb_* brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile
+do
+ rm $f
+done
+for i in /usr/share/automake-*/*; do
+ if test -f "$i" && test -f "${i##*/}"; then
+ rm -f "${i##*/}"
+ fi
+done
+popd
+gzip -9 CHANGES
%clean
rm -rf $RPM_BUILD_ROOT
@@ -288,9 +304,9 @@ fi
%files
%defattr(-,root,root)
-%doc RPM-PGP-KEY RPM-GPG-KEY CHANGES COPYING GROUPS
+%doc CHANGES.gz COPYING GROUPS
%doc doc/manual
-%doc RPM-HOWTO RPM-Tips RPM-Changes
+%doc RPM-HOWTO RPM-Tips
/etc/rpm
/bin/rpm
/usr/bin/*
@@ -299,7 +315,6 @@ fi
/usr/lib/rpm
%{_libdir}/librpm*-*.so
%doc %{_mandir}/man[18]/*.[18]*
-#%doc %{_mandir}/*/man[18]/*.[18]*
/usr/share/locale/*/LC_MESSAGES/rpm.mo
%dir /var/lib/rpm
%dir /var/spool/repackage
@@ -322,10 +337,10 @@ fi
%{_libdir}/librpmio.so
%package -n popt
Summary: A C library for parsing command line parameters
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: LGPL v2 or later
Group: System/Libraries
Version: 1.7
-Release: 340
+Release: 349
#
%description -n popt
@@ -345,10 +360,10 @@ Authors:
%package -n popt-devel
Summary: C Library for Parsing Command Line Parameters
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: LGPL v2 or later
Group: System/Libraries
Version: 1.7
-Release: 340
+Release: 349
Requires: popt = 1.7
Requires: glibc-devel
@@ -384,6 +399,8 @@ Authors:
%doc %{_mandir}/man3/popt.3*
%changelog
+* Fri Jun 15 2007 - dmueller@suse.de
+- package size reduction (28%%)
* Sun May 27 2007 - schwab@suse.de
- Remove duplicate rpmpopt alias.
* Fri May 25 2007 - mls@suse.de