]> git.pld-linux.org Git - packages/rpm.git/blobdiff - rpm.spec
- instead of complicated dance with adding our macro files, just
[packages/rpm.git] / rpm.spec
index eab55b1ec24aab61cf54f45129d67dffd65229ff..fda1614dfdec3d0b4cde596efc4c67c87e703612 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
 # - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.*
 #   matches ELF first
 # - add macros for some ppc, mipsel, alpha and sparc
-# - uppackaged list:
-#   /usr/bin/multiarch-dispatch
-#   /usr/bin/multiarch-platform
-#   /usr/include/multiarch-dispatch.h
-#   /usr/lib/rpm/bin/api-sanity-autotest.pl
-#   /usr/lib/rpm/bin/api-sanity-checker.pl
-#   /usr/lib/rpm/bin/chroot
-#   /usr/lib/rpm/bin/cp
-#   /usr/lib/rpm/bin/dbconvert
-#   /usr/lib/rpm/bin/find
-#   /usr/lib/rpm/bin/mgo
-#   /usr/lib/rpm/bin/pom2spec
-#   /usr/lib/rpm/bin/sqlite3
-#   /usr/lib/rpm/check-multiarch-files
-#   /usr/lib/rpm/dbconvert.sh
-#   /usr/lib/rpm/gem_helper.rb
-#   /usr/lib/rpm/gstreamer.sh
-#   /usr/lib/rpm/kmod-deps.sh
-#   /usr/lib/rpm/macros.d/cmake
-#   /usr/lib/rpm/macros.d/gstreamer
-#   /usr/lib/rpm/macros.d/kernel
-#   /usr/lib/rpm/macros.d/mandriva
-#   /usr/lib/rpm/macros.d/ruby
-#   /usr/lib/rpm/macros.d/tcl
-#   /usr/lib/rpm/mkmultiarch
-#   /usr/lib/rpm/pythoneggs.py
-#   /usr/lib/rpm/rubygems.rb
 #
 # - headerGet() making poldek segfault http://rpm5.org/cvs/tktview?tn=38,1
 # - rpm doesn't exit when no sources/patches available http://rpm5.org/cvs/tktview?tn=40,1
@@ -88,6 +61,8 @@ Group:                Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
 Source0:       %{name}-%{version}.tar.gz
 # Source0-md5: 5d099161bdd3203265ab32ffad3360b5
+Source100:     cpu-os-macros.tar.gz
+# Source100-md5:       928034a5bdceb398881bc14b5f29973b
 Source1:       %{name}.groups
 Source2:       macros.pld.in
 Source3:       %{name}-install-tree
@@ -95,14 +70,12 @@ Source4:    %{name}-find-spec-bcond
 Source5:       %{name}-hrmib-cache
 Source6:       %{name}-groups-po.awk
 Source7:       %{name}-compress-doc
-Source8:       %{name}-check-files
 Source9:       %{name}-php-provides
 Source10:      %{name}-php-requires
 Source11:      %{name}.sysinfo
 Source12:      perl.prov
 Source13:      %{name}-user_group.sh
 Source14:      %{name}.sysconfig
-Source15:      %{name}-macros.java
 Source16:      %{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source17:      banner.sh
@@ -116,21 +89,7 @@ Source24:   rpm.noautoprovfiles
 Source25:      rpm.noautoreq
 Source26:      rpm.noautoreqdep
 Source27:      rpm.noautoreqfiles
-Source100:     %{name}-macros-athlon
-Source101:     %{name}-macros-i386
-Source102:     %{name}-macros-i486
-Source103:     %{name}-macros-i586
-Source104:     %{name}-macros-i686
-Source105:     %{name}-macros-noarch
-Source106:     %{name}-macros-pentium3
-Source107:     %{name}-macros-pentium4
-Source108:     %{name}-macros-ppc
-Source109:     %{name}-macros-x86_64
-Source110:     %{name}-macros-ia32e
-Source111:     %{name}-macros-amd64
-# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
-Source112:     cpu-os-macros.tar.gz
-# Source112-md5:       6fc7b779cd5476996fdc7872863e2106
+Source29:      %{name}-php-requires.php
 
 Patch0:                %{name}-branch.patch
 Patch1:                %{name}-man_pl.patch
@@ -159,7 +118,6 @@ Patch41:    vendor-pld.patch
 
 Patch42:       %{name}-old-fileconflicts-behaviour.patch
 
-Patch46:       %{name}-mono.patch
 Patch47:       %{name}-javadeps.patch
 
 Patch55:       %{name}-truncate-cvslog.patch
@@ -170,8 +128,19 @@ Patch61:   %{name}-sparc64.patch
 Patch62:       %{name}-gendiff.patch
 Patch70:       %{name}-configure-autoconf.patch
 Patch72:       openmp.patch
-Patch73:       rpm-URPM-build-fix.patch
-Patch74:       rpm-db5.3.patch
+Patch73:       %{name}-URPM-build-fix.patch
+Patch74:       %{name}-db5.3.patch
+Patch75:       %{name}-helperEVR-noassert.patch
+Patch76:       %{name}-unglobal.patch
+Patch77:       %{name}-builddir-readlink.patch
+Patch78:       %{name}-changelog_order_check_nonfatal.patch
+Patch79:       %{name}-cleanbody.patch
+Patch80:       %{name}-dirdeps-macro.patch
+Patch81:       %{name}-installbeforeerase.patch
+Patch82:       %{name}-libmagic-locale.patch
+Patch83:       %{name}-namespace-probe.patch
+Patch84:       %{name}-popt-coreutils.patch
+Patch85:       %{name}-postun-nofail.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1.4
@@ -613,6 +582,7 @@ Group:              Applications/File
 Requires:      %{name} = %{version}-%{release}
 Requires:      python
 Requires:      python-modules
+Requires:      python-distribute
 
 %description pythonprov
 Python macros, which simplifies creation of RPM packages with Python
@@ -683,7 +653,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 źrodeł RPM-a przez doxygen.
 
 %prep
-%setup -q -n %{name}-%{version}%{?subver}
+%setup -q -n %{name}-%{version}%{?subver} -a100
 #patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -697,13 +667,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
-echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
-echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl
-echo '# obsoleted file' > macros.python
-echo '%%define __php_provides  /usr/lib/rpm/php.prov' > macros.php
-echo '%%define __php_requires  /usr/lib/rpm/php.req' >> macros.php
-echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono
-echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
@@ -719,7 +682,6 @@ install %{SOURCE12} scripts/perl.prov
 %patch37 -p1
 %patch41 -p1
 %patch42 -p1
-%patch46 -p1
 %patch47 -p1
 %patch55 -p1
 %patch59 -p1
@@ -734,6 +696,17 @@ install %{SOURCE12} scripts/perl.prov
 %patch72 -p1 -b .wiget
 %patch73 -p1
 %patch74 -p1
+%patch75 -p1
+%patch76 -p1
+%patch77 -p1
+%patch78 -p1
+%patch79 -p1
+%patch80 -p1
+%patch81 -p1
+%patch82 -p1
+%patch83 -p1
+%patch84 -p1
+%patch85 -p1
 
 cp -p %{SOURCE2} macros/pld.in
 
@@ -782,8 +755,7 @@ awk -f %{SOURCE6} %{SOURCE1}
        --with-pcre=external \
        --with-keyutils=none \
        --without-path-versioned \
-       --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-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/macros.d/pld:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
        --with-bugreport="http://bugs.pld-linux.org/" \
        --with-vendor=pld
 
@@ -806,29 +778,29 @@ install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key
 
 # install ARCH macros
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux
-install %{SOURCE105} $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
+install cpu-os-macros/noarch-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
 
 %ifarch %{ix86}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux
-install %{SOURCE100} $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
-install %{SOURCE101} $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
-install %{SOURCE102} $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
-install %{SOURCE103} $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
-install %{SOURCE104} $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
-install %{SOURCE106} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
-install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
+install cpu-os-macros/athlon-linux/macros   $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
+install cpu-os-macros/i386-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
+install cpu-os-macros/i486-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
+install cpu-os-macros/i586-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
+install cpu-os-macros/i686-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
+install cpu-os-macros/pentium3-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
+install cpu-os-macros/pentium4-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
 %endif
 
 %ifarch %{x8664}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux
-install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
-install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
-install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
+install cpu-os-macros/x86_64-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
+install cpu-os-macros/ia32e-linux/macros  $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
+install cpu-os-macros/amd64-linux/macros  $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
 %endif
 
 %ifarch %{ppc}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux
-install %{SOURCE108} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
+install cpu-os-macros/ppc-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
 %endif
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
@@ -921,21 +893,15 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 # not installed since 4.4.8 (-tools-perl subpackage)
 install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir}
 
-install macros.perl    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
-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 %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
-install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files
 install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
 install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
 install scripts/find-php*      $RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
+cp -p %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php
 install %{SOURCE20} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh
 install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
@@ -971,13 +937,6 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuil
        ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
-# remove arch dependant macros which have no use on noarch
-%{__sed} -i -e '
-/{__spec_install_post_strip}/d
-/{__spec_install_post_chrpath}/d
-/{__spec_install_post_compress_modules}/d
-' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
-
 # Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio
 mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
 
@@ -990,6 +949,10 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
 %{__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
+# utils dropped in 5.4 -- their manuals
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rpmgrep.1
+# script obsoleted by /usr/lib/rpm/bin/dbconvert binary
+%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/dbconvert.sh
 
 %find_lang %{name}
 
@@ -1064,12 +1027,16 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
 
+%dir %{_rpmlibdir}/bin
+%attr(755,root,root) %{_rpmlibdir}/bin/dbconvert
+
 %files base
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/rpm
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rpm
 %dir %{_rpmlibdir}
 %attr(755,root,root) %{_bindir}/banner.sh
+%attr(755,root,root) %{_bindir}/multiarch-dispatch
 %attr(755,root,root) %{_rpmlibdir}/user_group.sh
 %dir /var/lib/banner
 
@@ -1098,6 +1065,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so
 %{_libdir}/librpm*.la
 %{_includedir}/rpm
+%{_includedir}/multiarch-dispatch.h
 %{_pkgconfigdir}/*.pc
 
 %files static
@@ -1111,8 +1079,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt
 %attr(755,root,root) %{_rpmlibdir}/tgpg
-%dir %{_rpmlibdir}/bin
+%attr(755,root,root) %{_rpmlibdir}/bin/chroot
+%attr(755,root,root) %{_rpmlibdir}/bin/cp
 %attr(755,root,root) %{_rpmlibdir}/bin/debugedit
+%attr(755,root,root) %{_rpmlibdir}/bin/find
+%attr(755,root,root) %{_rpmlibdir}/bin/mgo
 %attr(755,root,root) %{_rpmlibdir}/bin/mtree
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcache
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp
@@ -1160,9 +1131,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/mimetypedeps.sh
 # needs hacked pkg-config to return anything
 %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
-%dir %{_rpmlibdir}/bin
+%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-autotest.pl
+%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-checker.pl
 %attr(755,root,root) %{_rpmlibdir}/bin/install-sh
 %attr(755,root,root) %{_rpmlibdir}/bin/mkinstalldirs
+%attr(755,root,root) %{_rpmlibdir}/bin/pom2spec
+%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump
+%attr(755,root,root) %{_rpmlibdir}/bin/sqlite3
+%attr(755,root,root) %{_rpmlibdir}/bin/wget
 %attr(755,root,root) %{_rpmlibdir}/vcheck
 %{_rpmlibdir}/noarch-*
 %ifarch %{ix86}
@@ -1190,28 +1166,36 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/ia32e*
 %{_rpmlibdir}/x86_64*
 %endif
-# must be here for "Requires: rpm-*prov" to work
-%{_rpmlibdir}/macros.java
-%{_rpmlibdir}/macros.mono
-%{_rpmlibdir}/macros.perl
-%{_rpmlibdir}/macros.php
 # not used yet ... these six depend on perl
 %attr(755,root,root) %{_rpmlibdir}/http.req
 %attr(755,root,root) %{_rpmlibdir}/mono*
+
+# must be here for "Requires: rpm-*prov" to work
+%{_rpmlibdir}/macros.d/cmake
+%{_rpmlibdir}/macros.d/gstreamer
 %{_rpmlibdir}/macros.d/java
+%{_rpmlibdir}/macros.d/kernel
 %{_rpmlibdir}/macros.d/libtool
 %{_rpmlibdir}/macros.d/mono
 %{_rpmlibdir}/macros.d/perl
 %{_rpmlibdir}/macros.d/php
 %{_rpmlibdir}/macros.d/pkgconfig
 %{_rpmlibdir}/macros.d/python
+%{_rpmlibdir}/macros.d/ruby
 %{_rpmlibdir}/macros.d/selinux
+%{_rpmlibdir}/macros.d/tcl
 %{_rpmlibdir}/macros.rpmbuild
 
+%attr(755,root,root) %{_rpmlibdir}/check-multiarch-files
+%attr(755,root,root) %{_rpmlibdir}/gem_helper.rb
+%attr(755,root,root) %{_rpmlibdir}/gstreamer.sh
+%attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh
+%attr(755,root,root) %{_rpmlibdir}/mkmultiarch
+%attr(755,root,root) %{_rpmlibdir}/rubygems.rb
+
 %attr(755,root,root) %{_bindir}/gendiff
+%attr(755,root,root) %{_bindir}/multiarch-platform
 %attr(755,root,root) %{_bindir}/rpmbuild
-%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump
-%attr(755,root,root) %{_rpmlibdir}/bin/wget
 
 %dir %{_rpmlibdir}/helpers
 %attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs
@@ -1236,7 +1220,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %files pythonprov
 %defattr(644,root,root,755)
-%{_rpmlibdir}/macros.python
+%attr(755,root,root) %{_rpmlibdir}/pythoneggs.py
 %attr(755,root,root) %{_rpmlibdir}/pythondeps.sh
 
 %files php-pearprov
This page took 0.03485 seconds and 4 git commands to generate.