pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2007-03-23 16:13:50 +00:00 committed by Git OBS Bridge
parent 6485e3dfdc
commit 00c558150c
5 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
popt-so-version.diff
View File

@ -1,11 +0,0 @@
--- popt/Makefile.am
+++ popt/Makefile.am
@@ -39,7 +39,7 @@
usrlib_LTLIBRARIES = libpopt.la
libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-libpopt_la_LDFLAGS = @INTLLIBS@
+libpopt_la_LDFLAGS = @INTLLIBS@ -version-info 8:0:7
man_MANS = popt.3

31
popt-to-lib.diff Normal file
View File

@ -0,0 +1,31 @@
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

2
rpm-python.spec
View File

@ -16,7 +16,7 @@ License: GNU General Public License (GPL)
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
Release: 97
Release: 98
Requires: rpm = %{version}
%py_requires

8
rpm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Thu Mar 22 16:41:44 CET 2007 - stbinner@suse.de

31
rpm.spec
View File

@ -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 @@ Patch87: build.diff
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 @@ Summary: Include Files and Libraries mandatory for Development.
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/lib
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 @@ Summary: A C library for parsing command line parameters
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 @@ Summary: C Library for Parsing Command Line Parameters
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 @@ Authors:
%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]