SPECS: rpm.spec - updated to 4.4.3 - removed obsolete build, kill-p...
qboosh
qboosh at pld-linux.org
Sat Nov 19 11:55:38 CET 2005
Author: qboosh Date: Sat Nov 19 10:55:38 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to 4.4.3
- removed obsolete build,kill-prereq,glob,posttrans patches
- updated pl.po,rpmrc,rpm-noexpand,arch,rpmpopt,etc_dir,system_libs-more,
php-deps,perl_req,po,debuginfo,doxygen_hack,pld-autodep,no-neon,no-sqlite,
mono,requireseq,macros,cleanlibdirs patches
- some new features:
- rollback improvements
- Requires(hint) / BuildRequires(hint) support (so called Suggests/Enhances)
- cpuinfo() deps (e.g. "Requires: cpuinfo(mmx)")
- getconf() deps (e.g. "Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL")
- uname() deps (e.g. "Requires: uname(release) >= 2.6.14")
- bash,java,libtool,pkgconfig dependency generators (need testing)
---- Files affected:
SPECS:
rpm.spec (1.712 -> 1.713)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.712 SPECS/rpm.spec:1.713
--- SPECS/rpm.spec:1.712 Tue Nov 8 16:53:01 2005
+++ SPECS/rpm.spec Sat Nov 19 11:55:33 2005
@@ -5,7 +5,7 @@
# ELF first; it should be provided by python-libs not binary anyway)
#
# Conditional build:
-%bcond_with static # build static rpmi (not supported at the moment)
+%bcond_with static # build static rpm+rpmi
%bcond_without apidocs # don't generate documentation with doxygen
%bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X)
%bcond_without python # don't build python bindings
@@ -18,7 +18,7 @@
# versions of required libraries
%define reqdb_ver 4.3.27-1
-%define reqpopt_ver 1.10.2
+%define reqpopt_ver 1.10.3
%define beecrypt_ver 2:4.1.2-4
Summary: RPM Package Manager
Summary(de): RPM Packet-Manager
@@ -29,12 +29,12 @@
Summary(uk): íĹÎĹÄÖĹŇ ĐÁËĹÔŚ× ×ŚÄ RPM
Name: rpm
%define sover 4.4
-Version: 4.4.2
-Release: 26.1
+Version: 4.4.3
+Release: 0.1
License: GPL
Group: Base
Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
-# Source0-md5: e24ce468082479fe850c9d6563f56db5
+# Source0-md5: 12ffef41c0f0ff565d2f6a89ad6c0598
Source1: %{name}.groups
Source2: %{name}.platform
Source3: %{name}-install-tree
@@ -66,7 +66,7 @@
Patch8: %{name}-python-macros.patch
Patch9: %{name}-gettext-in-header.patch
Patch10: %{name}-compress-doc.patch
-Patch11: %{name}-build.patch
+
Patch12: %{name}-system_libs.patch
Patch13: %{name}-bb-and-short-circuit.patch
Patch14: %{name}-etc_dir.patch
@@ -93,16 +93,16 @@
Patch35: %{name}-perl_req-INC_dirs.patch
Patch36: %{name}-debuginfo.patch
Patch37: %{name}-doxygen_hack.patch
-Patch38: %{name}-kill-prereq.patch
+
Patch39: %{name}-pythondeps.patch
Patch40: %{name}-print-requires.patch
Patch41: %{name}-reduce-stack-usage.patch
-Patch42: %{name}-glob.patch
+
Patch43: %{name}-patch-quote.patch
Patch44: %{name}-no-neon.patch
Patch45: %{name}-no-sqlite.patch
Patch46: %{name}-mono.patch
-Patch47: %{name}-posttrans.patch
+
Patch48: %{name}-requireseq.patch
Patch49: %{name}-p4.patch
Patch50: %{name}-macros.patch
@@ -617,10 +617,10 @@
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
%patch2 -p1
-# temporarily moved after patch0 - messes too much in pl.po
-#%patch3 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -628,7 +628,6 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -666,22 +665,17 @@
%patch35 -p0
%patch36 -p1
%patch37 -p1
-%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch41 -p1
-%patch42 -p1
%patch43 -p1
%{!?with_neon:%patch44 -p1}
%patch45 -p1
%patch46 -p1
-%patch47 -p1
%patch48 -p1
%patch49 -p1
%patch50 -p1
%patch51 -p1
-%patch0 -p1
-%patch3 -p1
cd scripts
mv -f perl.req perl.req.in
@@ -731,10 +725,12 @@
CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
# pass CC and CXX too in case of building with some older configure macro
+# disable perl-RPM2 build, we have it in separate spec
%configure \
CC="%{__newcc}" \
CXX="%{__newcxx}" \
CPP="%{__newcpp}" \
+ WITH_PERL_VERSION=no \
%{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
--enable-shared \
--enable-static \
@@ -742,7 +738,6 @@
%{?with_python:--with-python=auto} \
%{!?with_python:--without-python} \
%{!?with_selinux:--without-selinux} \
- --with-glob \
--without-db
# file_LDFLAGS, debugedit_LDADD - no need to link "file" and "debugedit" statically
@@ -753,9 +748,8 @@
pylibdir=%{py_libdir} \
myLDFLAGS="%{rpmldflags}" \
file_LDFLAGS= \
- debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt"
-
-# %{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \
+ debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" \
+ staticLDFLAGS=%{?with_static:-all-static}
%{?with_apidocs:%{__make} doxygen}
@@ -908,9 +902,13 @@
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-for f in $RPM_BUILD_ROOT%{_datadir}/locale/{en_RN,eu_ES,gl,hu,ro,wa,zh,zh_CN.GB2312}/LC_MESSAGES/rpm.mo ; do
- [ "`file $f | sed -e 's/.*,//' -e 's/message.*//'`" -le 1 ] && rm -f $f
-done
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
+
+# (currently) not used or supported in PLD
+rm -f $RPM_BUILD_ROOT%{_rpmlibdir}/{Specfile.pm,cpanflute,cpanflute2,find-provides,find-requires,freshen.sh,http.req,magic.prov,magic.req,perldeps.pl,sql.prov,sql.req,tcl.req}
+# wrong location, not used anyway
+rm -f $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd}
+
%find_lang %{name}
rm -rf manual
@@ -1021,10 +1019,6 @@
%files utils-perl
%defattr(644,root,root,755)
%attr(755,root,root) %{_rpmlibdir}/rpmdiff*
-# not here
-#%%{_rpmlibdir}/rpm.daily
-#%%{_rpmlibdir}/rpm.log
-#%%{_rpmlibdir}/rpm.xinetd
%if %{with static}
%files utils-static
@@ -1036,28 +1030,24 @@
%files build
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/noauto*
+%attr(755,root,root) %{_rpmlibdir}/brp-*
+%attr(755,root,root) %{_rpmlibdir}/check-files
+%attr(755,root,root) %{_rpmlibdir}/check-prereqs
%attr(755,root,root) %{_rpmlibdir}/compress-doc
+%attr(755,root,root) %{_rpmlibdir}/config.*
%attr(755,root,root) %{_rpmlibdir}/cross-build
-#%attr(755,root,root) %{_rpmlibdir}/find-provides
-#%attr(755,root,root) %{_rpmlibdir}/find-provides-wrapper
-#%attr(755,root,root) %{_rpmlibdir}/find-requires
-#%attr(755,root,root) %{_rpmlibdir}/find-requires-wrapper
-#%attr(755,root,root) %{_rpmlibdir}/find-rpm-provides
%attr(755,root,root) %{_rpmlibdir}/find-spec-bcond
%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
-%attr(755,root,root) %{_rpmlibdir}/mkinstalldirs
-%attr(755,root,root) %{_rpmlibdir}/config.*
%attr(755,root,root) %{_rpmlibdir}/getpo.sh
%attr(755,root,root) %{_rpmlibdir}/install-build-tree
-%attr(755,root,root) %{_rpmlibdir}/brp-*
-%attr(755,root,root) %{_rpmlibdir}/check-files
-%attr(755,root,root) %{_rpmlibdir}/check-prereqs
-#%attr(755,root,root) %{_rpmlibdir}/cpanflute
-#%attr(755,root,root) %{_rpmlibdir}/cpanflute2
-#%attr(755,root,root) %{_rpmlibdir}/Specfile.pm
+%attr(755,root,root) %{_rpmlibdir}/mkinstalldirs
%attr(755,root,root) %{_rpmlibdir}/u_pkg.sh
-#%attr(755,root,root) %{_rpmlibdir}/vpkg-provides.sh
-#%attr(755,root,root) %{_rpmlibdir}/vpkg-provides2.sh
+%attr(755,root,root) %{_rpmlibdir}/executabledeps.sh
+# needs jar (any jdk), jcf-dump (gcc-java) to work
+%attr(755,root,root) %{_rpmlibdir}/javadeps.sh
+%attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh
+# needs hacked pkg-config to return anything
+%attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
%attr(755,root,root) %{_rpmlibdir}/rpmb
%attr(755,root,root) %{_rpmlibdir}/rpmt
%{_rpmlibdir}/noarch-*
@@ -1153,6 +1143,20 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.713 2005/11/19 10:55:33 qboosh
+- updated to 4.4.3
+- removed obsolete build,kill-prereq,glob,posttrans patches
+- updated pl.po,rpmrc,rpm-noexpand,arch,rpmpopt,etc_dir,system_libs-more,
+ php-deps,perl_req,po,debuginfo,doxygen_hack,pld-autodep,no-neon,no-sqlite,
+ mono,requireseq,macros,cleanlibdirs patches
+- some new features:
+ - rollback improvements
+ - Requires(hint) / BuildRequires(hint) support (so called Suggests/Enhances)
+ - cpuinfo() deps (e.g. "Requires: cpuinfo(mmx)")
+ - getconf() deps (e.g. "Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL")
+ - uname() deps (e.g. "Requires: uname(release) >= 2.6.14")
+ - bash,java,libtool,pkgconfig dependency generators (need testing)
+
Revision 1.712 2005/11/08 15:53:01 qboosh
- added cleanlibdirs patch (avoid -L poisoning in *.la)
- release 26.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.712&r2=1.713&f=u
More information about the pld-cvs-commit
mailing list