[packages/rpm] Macro files and dead spec content cleanup
baggins
baggins at pld-linux.org
Mon Sep 3 08:36:25 CEST 2012
commit 086976808583daaa0e5103a1ab5f51e723ae5a60
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Sep 3 08:27:12 2012 +0200
Macro files and dead spec content cleanup
Replace plethora of macro files, patches for them and spec-generated
content with just two files - _rpmlibdir/macros.d/pld and /etc/rpm/macros
Also, use separate files for noauto* configs, as it helps spec
readability and, for the same reason, removed long-dead, commented out
parts of the spec file.
TODO: review configure options pertaining to macros
macros.local | 18 ++++++
macros.pld.in | 147 ++++++++++++++++++++++++++++++++++++++++++++
rpm-compress-doc.patch | 14 -----
rpm-debuginfo.patch | 38 ------------
rpm-macros-th.patch | 24 --------
rpm-macros.patch | 95 -----------------------------
rpm-pld.macros | 57 -----------------
rpm.noautocompressdoc | 1 +
rpm.noautoprov | 1 +
rpm.noautoprovfiles | 1 +
rpm.noautoreq | 1 +
rpm.noautoreqdep | 58 ++++++++++++++++++
rpm.noautoreqfiles | 3 +
rpm.platform | 39 ------------
rpm.spec | 162 +++++++++----------------------------------------
vendor-pld.patch | 20 ++++++
16 files changed, 279 insertions(+), 400 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 6df65b4..eab55b1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -89,7 +89,7 @@ Group: Base
Source0: %{name}-%{version}.tar.gz
# Source0-md5: 5d099161bdd3203265ab32ffad3360b5
Source1: %{name}.groups
-Source2: %{name}.platform
+Source2: macros.pld.in
Source3: %{name}-install-tree
Source4: %{name}-find-spec-bcond
Source5: %{name}-hrmib-cache
@@ -106,10 +106,16 @@ Source15: %{name}-macros.java
Source16: %{name}-java-requires
# http://svn.pld-linux.org/banner.sh/
Source17: banner.sh
-Source18: %{name}-pld.macros
Source19: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
# Source19-md5: 08b29584dd349aac9caa7610131a0a88
Source20: %{name}-mimetypedeps
+Source21: macros.local
+Source22: rpm.noautocompressdoc
+Source23: rpm.noautoprov
+Source24: rpm.noautoprovfiles
+Source25: rpm.noautoreq
+Source26: rpm.noautoreqdep
+Source27: rpm.noautoreqfiles
Source100: %{name}-macros-athlon
Source101: %{name}-macros-i386
Source102: %{name}-macros-i486
@@ -135,13 +141,10 @@ Patch5: %{name}-perl-req-perlfile.patch
Patch7: %{name}-scripts-closefds.patch
Patch8: %{name}-php-macros.patch
Patch9: %{name}-gettext-in-header.patch
-Patch10: %{name}-compress-doc.patch
Patch11: %{name}-lua.patch
Patch14: %{name}-etc_dir.patch
Patch16: %{name}-php-deps.patch
-Patch17: %{name}-macros.patch
-Patch18: %{name}-macros-th.patch
Patch19: %{name}-glob.patch
Patch26: %{name}-notsc.patch
@@ -690,8 +693,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch7 -p1
%patch8 -p1
%patch9 -p1
-# compress doc in upstream
-%patch10 -p1
%{?with_system_lua:%patch11 -p1}
# CHECK ME - macrofiles: ~/etc could be used
#%%patch14 -p1
@@ -722,8 +723,6 @@ install %{SOURCE12} scripts/perl.prov
%patch47 -p1
%patch55 -p1
%patch59 -p1
-%patch17 -p1
-%patch18 -p1
# Maybe, at last we can remove this?
#patch19 -p1
%patch60 -p1
@@ -736,6 +735,8 @@ install %{SOURCE12} scripts/perl.prov
%patch73 -p1
%patch74 -p1
+cp -p %{SOURCE2} macros/pld.in
+
cd scripts
mv -f perl.req perl.req.in
mv -f perl.prov perl.prov.in
@@ -744,12 +745,6 @@ cd ..
# generate Group translations to *.po
awk -f %{SOURCE6} %{SOURCE1}
-# update macros paths
-#for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do
-# sed -e 's at lib/rpm/redhat at lib/rpm/pld at g' $f > ${f}.tmp
-# mv -f ${f}.tmp $f
-#done
-
%build
%{__libtoolize}
#%{__autopoint}
@@ -758,10 +753,6 @@ awk -f %{SOURCE6} %{SOURCE1}
%{__autoconf}
%{__automake}
-# config.guess doesn't handle athlon, so we have to change it by hand.
-# rpm checks for CPU type at runtime, but it looks better
-#sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in
-
%{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"}
# pass CC and CXX too in case of building with some older configure macro
%configure \
@@ -791,8 +782,10 @@ awk -f %{SOURCE6} %{SOURCE1}
--with-pcre=external \
--with-keyutils=none \
--without-path-versioned \
- --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
- --with-bugreport="http://bugs.pld-linux.org/"
+ --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
+ --with-extra-path-macros=%{_rpmlibdir}/platform/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld \
+ --with-bugreport="http://bugs.pld-linux.org/" \
+ --with-vendor=pld
%{__make} -j1 \
CC="%{__cc}" \
@@ -920,11 +913,6 @@ sparc-[^-]*-[Ll]inux(-gnu)?
noarch-[^-]*-.*
EOF
-%ifarch %{ppc}
-#sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \
-# -i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros
-%endif
-
rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides*
rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
@@ -938,7 +926,6 @@ install macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
install macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
install macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
install %{SOURCE15} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
-install %{SOURCE18} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.pld
install %{SOURCE1} doc/manual/groups
install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -957,6 +944,14 @@ install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh
install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
+install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros
+install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc
+install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov
+install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles
+install %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq
+install %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep
+install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles
+
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames
install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos
@@ -964,99 +959,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Obsoletename
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Providename
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
-# customized rpm macros - global for host
-#
-#%%_install_langs pl_PL:en_US
-%%distribution PLD
-#
-# remove or replace with file_contexts path if you want to use custom
-# SELinux file contexts policy instead of one stored in packages payload
-%%_install_file_context_path %%{nil}
-%%_verify_file_context_path %%{nil}
-
-# If non-zero, all erasures will be automagically repackaged.
-#%%_repackage_all_erasures 1
-EOF
-
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
-# global list of files (regexps) which don't generate Provides
-EOF
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov <<EOF
-# global list of script capabilities (regexps) not to be used in Provides
-EOF
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles <<EOF
-# global list of files (regexps) which don't generate Requires
-^%{_examplesdir}/
-^%{_docdir}/
-EOF
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq <<EOF
-# global list of script capabilities (regexps) not to be used in Requires
-EOF
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep <<EOF
-# global list of capabilities (SONAME, perl(module), php(module) regexps)
-# which don't generate dependencies on package NAMES
-# -- OpenGL implementation
-^libGL.so.1
-^libGLU.so.1
-^libOSMesa.so
-# -- Glide
-^libglide3.so.3
-# -- mozilla
-^libgtkmozembed.so
-^libgtksuperwin.so
-^libxpcom.so
-# -- X11 implementation
-^libFS.so
-^libI810XvMC.so
-^libICE.so
-^libSM.so
-^libX11.so
-^libXRes.so
-^libXTrap.so
-^libXaw.so
-^libXcomposite.so
-^libXcursor.so
-^libXdamage.so
-^libXdmcp.so
-^libXevie.so
-^libXext.so
-^libXfixes.so
-^libXfont.so
-^libXfontcache.so
-^libXft.so
-^libXi.so
-^libXinerama.so
-^libXmu.so
-^libXmuu.so
-^libXp.so
-^libXpm.so
-^libXrandr.so
-^libXrender.so
-^libXss.so
-^libXt.so
-^libXtst.so
-^libXv.so
-^libXvMC.so
-^libXxf86dga.so
-^libXxf86misc.so
-^libXxf86rush.so
-^libXxf86vm.so
-^libdps.so
-^libdpstk.so
-^libfontenc.so
-^libpsres.so
-^libxkbfile.so
-^libxkbui.so
-# -- fam / gamin
-^libfam.so.0
-# -- mdns-bonjour: mDNSResponder-libs / avahi-compat-libdns_sd
-^libdns_sd.so.1
-EOF
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <<EOF
-# global list of file masks not to be compressed in DOCDIR
-EOF
-
# for rpm -e|-U --repackage
install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm}
touch $RPM_BUILD_ROOT/var/lock/rpm/transaction
@@ -1069,10 +971,6 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuil
ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
done
-# Append rpm.platform contents to /usr/lib/rpm/${arch}-linux/macros
-for m in $RPM_BUILD_ROOT%{_rpmlibdir}/*/macros ; do
- cat %{SOURCE2} | %{__sed} 's#@LIB@#%{_lib}#' >> $m
-done
# remove arch dependant macros which have no use on noarch
%{__sed} -i -e '
/{__spec_install_post_strip}/d
@@ -1086,18 +984,18 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-rm $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
# wrong location, not used anyway
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd}
+%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd}
# utils dropped in 4.4.8 -- their manuals
-rm $RPM_BUILD_ROOT%{_mandir}/*/man8/rpmgraph.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/rpmgraph.8
%find_lang %{name}
-rm -rf manual
+%{__rm} -rf manual
cp -a doc/manual manual
-rm -f manual/Makefile*
+%{__rm} -f manual/Makefile*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -1137,7 +1035,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/*
%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform
-
%{_mandir}/man8/rpm.8*
%lang(fr) %{_mandir}/fr/man8/rpm.8*
%lang(ja) %{_mandir}/ja/man8/rpm.8*
@@ -1161,7 +1058,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%{_rpmlibdir}/qf
%{_rpmlibdir}/rpmpopt*
%{_rpmlibdir}/macros
-%{_rpmlibdir}/macros.pld
+%dir %{_rpmlibdir}/macros.d
+%{_rpmlibdir}/macros.d/pld
%{_rpmlibdir}/cpuinfo.yaml
%attr(755,root,root) %{_rpmlibdir}/hrmib-cache
@@ -1300,7 +1198,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
# not used yet ... these six depend on perl
%attr(755,root,root) %{_rpmlibdir}/http.req
%attr(755,root,root) %{_rpmlibdir}/mono*
-%dir %{_rpmlibdir}/macros.d
%{_rpmlibdir}/macros.d/java
%{_rpmlibdir}/macros.d/libtool
%{_rpmlibdir}/macros.d/mono
@@ -1311,7 +1208,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%{_rpmlibdir}/macros.d/selinux
%{_rpmlibdir}/macros.rpmbuild
-
%attr(755,root,root) %{_bindir}/gendiff
%attr(755,root,root) %{_bindir}/rpmbuild
%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump
diff --git a/macros.local b/macros.local
new file mode 100644
index 0000000..635d1a7
--- /dev/null
+++ b/macros.local
@@ -0,0 +1,18 @@
+# customized rpm macros - global for host
+#
+#%_install_langs pl_PL:en_US
+#
+# remove or replace with file_contexts path if you want to use custom
+# SELinux file contexts policy instead of one stored in packages payload
+%_install_file_context_path %{nil}
+%_verify_file_context_path %{nil}
+
+# If non-zero, all erasures will be automagically repackaged.
+#%_repackage_all_erasures 1
+
+# If non-zero, create debuginfo packages
+#%_enable_debug_packages 0
+
+# Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
+# marked as %doc should be installed.
+#%_excludedocs 1
diff --git a/macros.pld.in b/macros.pld.in
new file mode 100644
index 0000000..2906629
--- /dev/null
+++ b/macros.pld.in
@@ -0,0 +1,147 @@
+# PLD rpm macros
+
+%distribution PLD Linux
+%vendor pld
+%bugurl http://bugs.pld-linux.org/
+%disturl http://www.pld-linux.org/
+%pld_release th
+
+#
+# Per-platform rpm configuration file.
+
+#==============================================================================
+# ---- per-platform macros.
+#
+%_vendor pld
+%_os linux
+%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
+
+#==============================================================================
+# ---- configure macros. note that most of these are inherited
+# from the defaults.
+#
+%_prefix /usr
+%_exec_prefix %{_prefix}
+%_bindir %{_exec_prefix}/bin
+%_sbindir %{_exec_prefix}/sbin
+%_libexecdir %{_exec_prefix}/%{_lib}
+%_datadir %{_prefix}/share
+%_sysconfdir %{_prefix}/etc
+%_sharedstatedir /var/lib
+%_localstatedir /var
+%_lib lib
+%_libdir %{_exec_prefix}/%{_lib}
+%_includedir %{_prefix}/include
+%_oldincludedir /usr/include
+%_infodir %{_prefix}/share/info
+%_mandir %{_prefix}/share/man
+%_initrddir %{_sysconfdir}/rc.d/init.d
+%_sysconfdir /etc
+
+%_defaultdocdir %{_usr}/share/doc
+
+%_fmoddir %{_libdir}/gfortran/modules
+
+# Executed at after copying %doc to DOCDIR, with $DOCDIR set
+%__compress_doc @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
+
+%__os_install_post \
+%{__spec_install_post_strip}\
+%{__spec_install_post_chrpath}\
+%{__spec_install_post_check_so}\
+%{__spec_install_post_check_tmpfiles}\
+%{__spec_install_post_compress_docs}\
+%{__spec_install_post_compress_modules}\
+%{__spec_install_post_py_hardlink}\
+%{__spec_install_post_perl_clean}\
+%{__arch_install_post}\
+%{nil}
+
+#---------------------------------------------------------------------
+# Template for debug information sub-package.
+%_enable_debug_packages 1
+%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
+
+%debug_package \
+%ifnarch noarch\
+%global __debug_package 1\
+%package debuginfo\
+Summary: Debug information for package %{name}\
+Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
+Group: Development/Debug\
+Requires: filesystem-debuginfo >= 3.0-16\
+AutoReqProv: 0\
+%description debuginfo\
+This package provides debug information for package %{name}.\
+Debug information is useful when developing applications that use this\
+package or when debugging this package.\
+%description debuginfo -l pl.UTF-8\
+Ten pakiet dostarcza informacje dla debuggera dla pakietu %{name}.\
+Informacje te są przydatne przy rozwijaniu aplikacji używających tego\
+pakietu oraz przy odpluskwianiu samego pakietu.\
+%files debuginfo -f debugfiles.list\
+%defattr(-,root,root)\
+%endif\
+%{nil}
+
+#---------------------------------------------------------------------
+# Overwrite RPM macros with PLD specific one here.
+
+%_tmppath %(echo "${TMPDIR:-/var/tmp}")
+%tmpdir %{_tmppath}
+
+%_topdir %(echo $HOME)/rpm
+
+%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+
+%_source_payload w9.gzdio
+%_binary_payload w9.lzdio
+
+%_rpmfc_magic_path /usr/share/file/magic
+
+%undefine __scriptlet_requires
+
+# provides don't obsolete
+%_upgrade_tag name
+
+#-----------------------------------------------------------------
+# CFLAGS and LDFLAGS used to build
+
+%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
+# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
+
+%debugcflags -O0 -g -Wall
+%debugcppflags %{nil}
+%debugldflags %{nil}
+
+%optldflags -Wl,--as-needed -Wl,-z,relro -Wl,-z,-combreloc
+%optcppflags -D_FORTIFY_SOURCE=2
+
+# Warning: those macros are overwritten by macros.build,
+# left here for compatibility
+%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
+%rpmcxxflags %{rpmcflags}
+%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
+%rpmcppflags -D_FORTIFY_SOURCE=2
+
+# arch macros
+%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
+%x8664 x86_64 amd64 ia32e
+%ppc ppc ppc7400 ppc7450
+
+
+#---------------------------------------------------------------------
+# Expanded at end of %prep
+#
+%__id_u %{__id} -u
+%__chown_Rhf %{__chown} -Rhf
+%__chgrp_Rhf %{__chgrp} -Rhf
+%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
+%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} root
+%_fixperms %{__chmod} -Rf a+rX,u+w,g-w,o-w
+
+%__id /bin/id
+
+#
+# rpm5 prolog for loading the standard macro
+%{load:/etc/rpm/macros.d/*.macros}
diff --git a/rpm-compress-doc.patch b/rpm-compress-doc.patch
deleted file mode 100644
index 2a87e6c..0000000
--- a/rpm-compress-doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur rpm-4.0.4/macros/macros.in rpm-4.0.4-/macros/macros.in
---- rpm-4.0.4/macros/macros.in Fri May 17 11:18:12 2002
-+++ rpm-4.0.4-/macros/macros.in Fri May 17 11:17:44 2002
-@@ -1208,6 +1208,9 @@
- #%__spec_triggerin_pre %{nil}
- #%__spec_triggerin_post %{nil}
-
-+# Executed at after copying %doc to DOCDIR, with $DOCDIR set
-+%__compress_doc @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
-+
- #==============================================================================
- # ---- configure macros.
- # Macro(s) slavishly copied from autoconf's config.status.
-
diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 248657b..949bdf2 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,41 +1,3 @@
---- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-03-31 14:22:06.000000000 +0200
-+++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 16:51:46.906008986 +0200
-@@ -383,7 +383,7 @@ echo "Patch #%{__patch_number} (%{basena
- %{?buildroot:%{__rm} -rf '%{buildroot}'; %{__mkdir_p} '%{buildroot}'}
- %__spec_install_body %{___build_body}
- %__spec_install_post\
--%{?__debug_package:%{__debug_install_post}}\
-+%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
- %{__arch_install_post}\
- %{__os_install_post}\
- %{nil}
---- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 16:47:23.389365448 +0200
-+++ rpm-5.3.1/macros/macros.in 2010-05-30 16:47:23.412699985 +0200
-@@ -131,15 +131,21 @@
- %debug_package \
- %ifnarch noarch\
- %global __debug_package 1\
--%package debug\
-+%package debuginfo\
- Summary: Debug information for package %{name}\
-+Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
- Group: Development/Debug\
-+Requires: filesystem-debuginfo >= 3.0-16\
- AutoReqProv: 0\
--%description debug\
-+%description debuginfo\
- This package provides debug information for package %{name}.\
- Debug information is useful when developing applications that use this\
- package or when debugging this package.\
--%files debug -f debugfiles.list\
-+%description debuginfo -l pl.UTF-8\
-+Ten pakiet dostarcza informacje dla debuggera dla pakietu %{name}.\
-+Informacje te są przydatne przy rozwijaniu aplikacji używających tego\
-+pakietu oraz przy odpluskwianiu samego pakietu.\
-+%files debuginfo -f debugfiles.list\
- %defattr(-,root,root)\
- %endif\
- %{nil}
--- rpm-5.3.1/scripts/find-debuginfo.sh.wiget 2009-09-10 03:52:13.000000000 +0200
+++ rpm-5.3.1/scripts/find-debuginfo.sh 2010-05-30 16:53:33.275994510 +0200
@@ -92,8 +92,10 @@ strip_to_debug()
diff --git a/rpm-macros-th.patch b/rpm-macros-th.patch
deleted file mode 100644
index 726a7b8..0000000
--- a/rpm-macros-th.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-05-30 17:11:07.699227892 +0200
-+++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 17:12:37.700048249 +0200
-@@ -102,6 +102,9 @@
- #
- #%distribution
-
-+# PLD Linux Release
-+%pld_release th
-+
- # Configurable bug URL, same as BugURL: tag in a specfile.
- # The URL will be used to supply reliable information to where
- # to file bugs.
---- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 17:10:50.702560935 +0200
-+++ rpm-5.3.1/macros/macros.in 2010-05-30 17:10:50.705892723 +0200
-@@ -956,7 +956,8 @@ pakietu oraz przy odpluskwianiu samego p
- # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
-
- %debugcflags -O0 -g -Wall
--%optldflags -Wl,--as-needed
-+%optldflags -Wl,--as-needed -Wl,-z,relro -Wl,-z,combreloc
-+%optcppflags -D_FORTIFY_SOURCE=2
-
- # Warning: those macros are overwritten by macros.build,
- # left here for compatibility
diff --git a/rpm-macros.patch b/rpm-macros.patch
deleted file mode 100644
index 02e4016..0000000
--- a/rpm-macros.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-05-30 17:03:38.009271449 +0200
-+++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 17:08:25.676741951 +0200
-@@ -123,8 +123,8 @@
- # "w6.lzdio" lzma level 6 (legacy, stable).
- # "w6.xzdio" xz level 6 (obsoletes lzma, unstable).
- #
--#%_source_payload w9.gzdio
--#%_binary_payload w9.gzdio
-+%_source_payload w9.gzdio
-+%_binary_payload w9.lzdio
-
- # Archive formats to use for source/binary package payloads.
- # "cpio" cpio archive (default)
---- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 17:03:38.009271449 +0200
-+++ rpm-5.3.1/macros/macros.in 2010-05-30 17:06:26.886075137 +0200
-@@ -150,7 +150,7 @@ pakietu oraz przy odpluskwianiu samego p
- %endif\
- %{nil}
-
--%_defaultdocdir %{_usr}/doc
-+%_defaultdocdir %{_usr}/share/doc
-
- # The path to the pgp executable (legacy, use %{__pgp} instead).
- %_pgpbin %{__pgp}
-@@ -183,14 +183,14 @@ pakietu oraz przy odpluskwianiu samego p
- %_buildrootdir @BUILDROOTDIR_MACRO@
-
- # Build root path, where %install installs the package during build.
--%buildroot %{_buildrootdir}/%{name}-root
-+%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
-
--# Directory where temporaray files can be created.
--%_tmppath %{_var}/tmp
-+# Directory where temporary files can be created.
-+%_tmppath %(echo "${TMPDIR:-/tmp}")
- %tmpdir %{_tmppath}
-
- # Path to top of build area.
--%_topdir @PKGSRCDIR_MACRO@
-+%_topdir %(echo $HOME)/rpm
-
- #==============================================================================
- # ---- Optional macros.
-@@ -846,11 +846,11 @@ pakietu oraz przy odpluskwianiu samego p
- %_datarootdir %{_prefix}/share
- %_bindir %{_exec_prefix}/bin
- %_sbindir %{_exec_prefix}/sbin
--%_libexecdir %{_exec_prefix}/libexec
-+%_libexecdir %{_exec_prefix}/lib
- %_datadir %{_datarootdir}
--%_sysconfdir %{_prefix}/etc
--%_sharedstatedir %{_prefix}/com
--%_localstatedir %{_prefix}/var
-+%_sysconfdir /etc
-+%_sharedstatedir /var/lib
-+%_localstatedir /var
- %_lib lib
- %_libdir %{_exec_prefix}/%{_lib}
- %_includedir %{_prefix}/include
-@@ -941,7 +941,33 @@ pakietu oraz przy odpluskwianiu samego p
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires %{__bash} --rpm-requires
-+#%__scriptlet_requires %{__bash} --rpm-requires
-
-+# PLD rpm macros
-+%_enable_debug_packages 1
-+
-+# provides don't obsolete
-+%_upgrade_tag name
-+
-+#-----------------------------------------------------------------
-+# CFLAGS and LDFLAGS used to build
-+
-+%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-+# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
-+
-+%debugcflags -O0 -g -Wall
-+%optldflags -Wl,--as-needed
-+
-+# Warning: those macros are overwritten by macros.build,
-+# left here for compatibility
-+%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-+%rpmcxxflags %{rpmcflags}
-+%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
-+
-+# arch macros
-+%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
-+%x8664 x86_64 amd64 ia32e
-+%ppc ppc ppc7400 ppc7450
-+
- #==============================================================================
- # XXX Caveat:
- # XXX With %{load:...} being interpreted immediately -- not lazily --
diff --git a/rpm-pld.macros b/rpm-pld.macros
deleted file mode 100644
index 5ba1720..0000000
--- a/rpm-pld.macros
+++ /dev/null
@@ -1,57 +0,0 @@
-# Overwrite RPM macros with PLD specific one here.
-
-%_defaultdocdir %{_usr}/share/doc
-
-%_tmppath %(echo "${TMPDIR:-/tmp}")
-%tmpdir %{_tmppath}
-
-%_topdir %(echo $HOME)/rpm
-
-%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
-
-%_source_payload w9.gzdio
-%_binary_payload w9.lzdio
-
-%_rpmfc_magic_path /usr/share/file/magic
-
-%_libexecdir %{_exec_prefix}/lib
-%_sysconfdir /etc
-%_sharedstatedir /var/lib
-%_localstatedir /var
-
-
-%_infodir %{_prefix}/share/info
-%_mandir %{_prefix}/share/man
-
-%undefine __scriptlet_requires
-
-%_enable_debug_packages 1
-
-# provides don't obsolete
-%_upgrade_tag name
-
-#-----------------------------------------------------------------
-# CFLAGS and LDFLAGS used to build
-
-%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
-
-%debugcflags -O0 -g -Wall
-%debugcppflags %{nil}
-%debugldflags %{nil}
-
-%optldflags -Wl,--as-needed -Wl,-z,relro -Wl,-z,-combreloc
-%optcppflags -D_FORTIFY_SOURCE=2
-
-# Warning: those macros are overwritten by macros.build,
-# left here for compatibility
-%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-%rpmcxxflags %{rpmcflags}
-%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
-%rpmcppflags -D_FORTIFY_SOURCE=2
-
-# arch macros
-%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
-%x8664 x86_64 amd64 ia32e
-%ppc ppc ppc7400 ppc7450
-
diff --git a/rpm.noautocompressdoc b/rpm.noautocompressdoc
new file mode 100644
index 0000000..e7bdc79
--- /dev/null
+++ b/rpm.noautocompressdoc
@@ -0,0 +1 @@
+# global list of file masks not to be compressed in DOCDIR
diff --git a/rpm.noautoprov b/rpm.noautoprov
new file mode 100644
index 0000000..440359e
--- /dev/null
+++ b/rpm.noautoprov
@@ -0,0 +1 @@
+# global list of script capabilities (regexps) not to be used in Provides
diff --git a/rpm.noautoprovfiles b/rpm.noautoprovfiles
new file mode 100644
index 0000000..c6e1ee5
--- /dev/null
+++ b/rpm.noautoprovfiles
@@ -0,0 +1 @@
+# global list of files (regexps) which don't generate Provides
diff --git a/rpm.noautoreq b/rpm.noautoreq
new file mode 100644
index 0000000..ec8fb4f
--- /dev/null
+++ b/rpm.noautoreq
@@ -0,0 +1 @@
+# global list of script capabilities (regexps) not to be used in Requires
diff --git a/rpm.noautoreqdep b/rpm.noautoreqdep
new file mode 100644
index 0000000..f156d17
--- /dev/null
+++ b/rpm.noautoreqdep
@@ -0,0 +1,58 @@
+# global list of capabilities (SONAME, perl(module), php(module) regexps)
+# which don't generate dependencies on package NAMES
+# -- OpenGL implementation
+^libGL.so.1
+^libGLU.so.1
+^libOSMesa.so
+# -- Glide
+^libglide3.so.3
+# -- mozilla
+^libgtkmozembed.so
+^libgtksuperwin.so
+^libxpcom.so
+# -- X11 implementation
+^libFS.so
+^libI810XvMC.so
+^libICE.so
+^libSM.so
+^libX11.so
+^libXRes.so
+^libXTrap.so
+^libXaw.so
+^libXcomposite.so
+^libXcursor.so
+^libXdamage.so
+^libXdmcp.so
+^libXevie.so
+^libXext.so
+^libXfixes.so
+^libXfont.so
+^libXfontcache.so
+^libXft.so
+^libXi.so
+^libXinerama.so
+^libXmu.so
+^libXmuu.so
+^libXp.so
+^libXpm.so
+^libXrandr.so
+^libXrender.so
+^libXss.so
+^libXt.so
+^libXtst.so
+^libXv.so
+^libXvMC.so
+^libXxf86dga.so
+^libXxf86misc.so
+^libXxf86rush.so
+^libXxf86vm.so
+^libdps.so
+^libdpstk.so
+^libfontenc.so
+^libpsres.so
+^libxkbfile.so
+^libxkbui.so
+# -- fam / gamin
+^libfam.so.0
+# -- mdns-bonjour: mDNSResponder-libs / avahi-compat-libdns_sd
+^libdns_sd.so.1
diff --git a/rpm.noautoreqfiles b/rpm.noautoreqfiles
new file mode 100644
index 0000000..10fb613
--- /dev/null
+++ b/rpm.noautoreqfiles
@@ -0,0 +1,3 @@
+# global list of files (regexps) which don't generate Requires
+^%{_examplesdir}/
+^%{_docdir}/
diff --git a/rpm.platform b/rpm.platform
deleted file mode 100644
index 6176f1e..0000000
--- a/rpm.platform
+++ /dev/null
@@ -1,39 +0,0 @@
-# PLD rpm macros
-
-%__id /bin/id
-%__id_u %{__id} -u
-%__chown_Rhf %{__chown} -Rhf
-%__chgrp_Rhf %{__chgrp} -Rhf
-
-%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root:root
-%_fixgroup true
-%_fixperms %{__chmod} -Rf -Rf a+rX,u+w,g-w,o-w
-
-%_exec_prefix %{_prefix}
-%_bindir %{_exec_prefix}/bin
-%_sbindir %{_exec_prefix}/sbin
-%_datadir %{_prefix}/share
-%_sharedstatedir /var/lib
-%_lib @LIB@
-%_libdir %{_exec_prefix}/%{_lib}
-%_libexecdir %{_exec_prefix}/%{_lib}
-%_includedir %{_prefix}/include
-%_oldincludedir /usr/include
-%_sysconfdir /etc
-%_localstatedir /var
-%_infodir /usr/share/info
-%_mandir %{_prefix}/share/man
-%_defaultdocdir /usr/share/doc
-
-%__os_install_post \
-%{__spec_install_post_strip}\
-%{__spec_install_post_chrpath}\
-%{__spec_install_post_check_so}\
-%{__spec_install_post_check_tmpfiles}\
-%{__spec_install_post_compress_docs}\
-%{__spec_install_post_compress_modules}\
-%{__spec_install_post_py_hardlink}\
-%{__spec_install_post_perl_clean}\
-%{__arch_install_post}\
-%{nil}
-
diff --git a/vendor-pld.patch b/vendor-pld.patch
index bdd5546..cd77531 100644
--- a/vendor-pld.patch
+++ b/vendor-pld.patch
@@ -10,3 +10,23 @@
esac
AC_MSG_RESULT([$withval])
else
+@@ -2485,7 +2485,7 @@
+ rpmdb/DB_CONFIG
+ macros/macros macros/macros.rpmbuild
+ macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
+- macros/mandriva macros/suse macros/fedora macros/mono macros/perl macros/pkgconfig macros/php
++ macros/pld macros/mandriva macros/suse macros/fedora macros/mono macros/perl macros/pkgconfig macros/php
+ macros/python macros/ruby macros/selinux macros/tcl
+ doc/Makefile
+ doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
+--- rpm-5.4.10/Makefile.am~ 2012-03-17 01:24:19.000000000 +0100
++++ rpm-5.4.10/Makefile.am 2012-09-03 00:08:35.599623394 +0200
+@@ -117,7 +117,7 @@
+ pkgcfgdir = $(pkgdatadir)/macros.d
+ pkgcfg_DATA = \
+ macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool \
+- macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php \
++ macros/pld macros/mono macros/perl macros/pkgconfig macros/php \
+ macros/python macros/ruby macros/selinux macros/tcl
+
+ noinst_HEADERS = build.h debug.h system.h
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/086976808583daaa0e5103a1ab5f51e723ae5a60
More information about the pld-cvs-commit
mailing list