X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rpm.spec;h=0c17c152f4faefa38ddad128d79720cd14bd12bf;hb=1c410f1d682901c73cd87c66422f694644976179;hp=2318731e39b568ac0ef3f87d70823c6e8a32427b;hpb=cf1989011b453d09a76b3edfa26428ab15bbd829;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 2318731..0c17c15 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,5 +1,11 @@ # # TODO: +# - manuals are not compressed +# - %{_arch} = i686 not as used to be i386: +# 5.0.2: rpm -E '%_target_base_arch %_arch' +# i386 i686 +# 4.4.9: rpm -E '%_target_base_arch %_arch' +# i386 i386 # - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.* # matches ELF first # - repackaging when lzma is not installed (todo: fix digest signature of header) @@ -7,6 +13,16 @@ # tags (incl. digest) and writes whole package to destination file; # repackaging uses unchanged "immutable header" image from original rpm, also # preserving payload format and compressor from original rpm, _not_ current settings +# - TODO: add macros for some ppc, mipsel, alpha and sparc +# - uppackaged list: +# /usr/lib/rpm/http.req +# /usr/lib/rpm/install-sh +# /usr/lib/rpm/mono-find-provides +# /usr/lib/rpm/mono-find-requires +# /usr/lib/rpm/osgideps.pl +# /usr/lib/rpm/perldeps.pl +# /usr/lib/rpm/vcheck +# /usr/share/man/man8/rpmconstant.8.gz # # Conditional build: %bcond_with static # build static rpm+rpmi @@ -18,6 +34,7 @@ %bcond_without db # BerkeleyDB %bcond_with sqlite # build with SQLite support %bcond_with sqlite_dbapi # default database backend is sqlite +%bcond_without system_lua # use system lua # force_cc - force using __cc other than "%{_target_cpu}-pld-linux-gcc" # force_cxx - force using __cxx other than "%{_target_cpu}-pld-linux-g++" # force_cpp - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E" @@ -27,7 +44,7 @@ %endif %if %{without db} && %{without sqlite} -%{error: Need db or sqlite} +%{error:Need db or sqlite} ERROR %endif @@ -45,17 +62,16 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 5.0 -Release: 0.1 -License: GPL +Version: 5.0.2 +Release: 0.5 +License: LGPL Group: Base -Source0: rpm-20070927.tar.gz -# Source0-md5: cf0bda3a41b74d68b36ef078edfafc6d +Source0: http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz +# Source0-md5: 596aaf5cd9dea7195f625530bc89e684 Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree Source4: %{name}-find-spec-bcond -Source5: %{name}-find-lang Source6: %{name}-groups-po.awk Source7: %{name}-compress-doc Source8: %{name}-check-files @@ -70,8 +86,22 @@ Source16: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ Source17: banner.sh Source18: %{name}-pld.macros -Patch0: %{name}-pl.po.patch +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 + +#Patch0: %{name}-pl.po.patch +Patch1: %{name}-man_pl.patch Patch3: %{name}-rpmpopt.patch Patch4: %{name}-perl-macros.patch Patch5: %{name}-perl-req-perlfile.patch @@ -80,6 +110,8 @@ 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 +Patch12: %{name}-scaremem.patch Patch14: %{name}-etc_dir.patch Patch16: %{name}-php-deps.patch @@ -88,18 +120,15 @@ Patch18: %{name}-perl_req.patch Patch23: %{name}-pkgconfigdeps.patch -Patch25: %{name}-rpm2cpio-payload.patch Patch26: %{name}-notsc.patch Patch27: %{name}-hack-norpmlibdep.patch -Patch31: %{name}-missing-prototypes.patch Patch32: %{name}-pld-autodep.patch Patch34: %{name}-epoch0.patch Patch35: %{name}-perl_req-INC_dirs.patch Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch -Patch41: %{name}-reduce-stack-usage.patch Patch42: %{name}-old-fileconflicts-behaviour.patch Patch46: %{name}-mono.patch @@ -114,16 +143,13 @@ Patch59: %{name}-libtool-deps.patch Patch61: %{name}-sparc64.patch URL: http://rpm5.org/ -BuildRequires: autoconf >= 2.57 +BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1.4 BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.2-17 %{?with_db:BuildRequires: db-devel >= %{reqdb_ver}} BuildRequires: elfutils-devel >= 0.108 -%ifnarch sparc64 -# -fPIE/-pie -BuildRequires: gcc >= 5:3.4 -%endif +BuildRequires: gettext-autopoint >= 0.11.4-2 BuildRequires: gettext-devel >= 0.11.4-2 BuildRequires: libmagic-devel %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} @@ -136,8 +162,9 @@ BuildRequires: neon-devel >= 0.25.5 %endif BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} -%{?with_python:BuildRequires: python-devel >= 1:2.5} -BuildRequires: python-modules >= 1:2.5 +%{?with_system_lua:BuildRequires: lua51-devel >= 5.1.2} +%{?with_python:BuildRequires: python-devel >= 1:2.3} +BuildRequires: python-modules >= 1:2.3 BuildRequires: rpm-perlprov %{?with_python:BuildRequires: rpm-pythonprov} %{?with_sqlite:BuildRequires: sqlite3-devel} @@ -169,6 +196,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # don't require very fresh rpm.macros to build %define __gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,} +%define find_lang sh ./scripts/find-lang.sh $RPM_BUILD_ROOT %define ix86 i386 i486 i586 i686 athlon pentium3 pentium4 %define ppc ppc ppc7400 ppc7450 %define x8664 amd64 ia32e x86_64 @@ -179,6 +207,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define __newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E} %define _rpmlibdir /usr/lib/rpm +%define _noautocompressdoc RPM-GPG-KEY %define specflags -fno-strict-aliasing @@ -236,6 +265,7 @@ Summary: RPM base package - scripts used by rpm packages themselves Summary(pl.UTF-8): Podstawowy pakiet RPM - skrypty używane przez same pakiety rpm Group: Base Requires: filesystem +Obsoletes: rpm-scripts Obsoletes: vserver-rpm %description base @@ -257,14 +287,14 @@ Summary(pl.UTF-8): Biblioteki RPM-a Group: Libraries Requires: beecrypt >= %{beecrypt_ver} %{?with_db:Requires: db >= %{reqdb_ver}} -%{?with_selinux:Requires: libselinux >= 1.18} Requires: libmagic >= 1.15-2 +%{?with_selinux:Requires: libselinux >= 1.18} Requires: popt >= %{reqpopt_ver} -Obsoletes: rpm-libs +%{?with_suggest_tags:Suggests: lzma} Obsoletes: rpm-apidocs +Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 -%{?with_suggest_tags:Suggests: lzma} %description lib RPMs library. @@ -382,6 +412,7 @@ Summary(pl.UTF-8): Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: popt >= %{reqpopt_ver} +Conflicts: filesystem-debuginfo < 3.0-16 %description utils Additional utilities for managing RPM packages and database. @@ -437,12 +468,10 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File Requires(pre): findutils -Requires: %{name}-build-macros >= 1.314 +Requires: %{name}-build-macros >= 1.433-2 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk -# we need fixed binutils for -feliminate-dwarf2-dups -Requires: binutils >= 3:2.17.50.0.3-2 Requires: bzip2 Requires: chrpath >= 0.10-4 Requires: cpio @@ -451,7 +480,11 @@ Requires: elfutils Requires: file >= 4.17 Requires: fileutils Requires: findutils -Requires: gcc >= 5:3.4 +%ifarch athlon +Requires: gcc >= 3.0.3 +%else +Requires: gcc +%endif Requires: glibc-devel Requires: grep Requires: gzip @@ -592,16 +625,11 @@ Esse pacote deve ser instalado se você quiser desenvolver programas em Python para manipular pacotes e bancos de dados RPM. %prep -%setup -q -n %{name} -sed -i -e 's# no # nb #g' configure.ac -mv po/no.po po/nb.po -sed -i -e 's# sr # sr@Latn #g' configure.ac -mv -f po/{sr,sr@Latn}.po - -sed -i -e 's#${prefix}/lib/python@WITH_PYTHON_VERSION@#@WITH_PYTHON_LIBDIR@#g' python/rpm/Makefile.am +%setup -q -# APPLIED ALREADY? -#%patch0 -p1 +# APPLIED ALREADY? translationproject.org is used now +#%%patch0 -p1 +%patch1 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -610,8 +638,10 @@ sed -i -e 's#${prefix}/lib/python@WITH_PYTHON_VERSION@#@WITH_PYTHON_LIBDIR@#g' p %patch8 -p1 %patch9 -p1 %patch10 -p1 -# CHECK ME -#%patch14 -p1 +%{?with_system_lua:%patch11 -p1} +%patch12 -p1 +# CHECK ME - macrofiles: ~/etc could be used +#%%patch14 -p1 %patch16 -p1 %patch18 -p1 echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl @@ -621,32 +651,26 @@ 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 %{SOURCE5} scripts/find-lang.sh install %{SOURCE9} scripts/php.prov.in install %{SOURCE10} scripts/php.req.in install %{SOURCE12} scripts/perl.prov %patch23 -p1 -%patch25 -p1 -%ifarch i386 + +%ifarch i386 i486 # disable TSC %patch26 -p1 %endif %patch27 -p1 -# CHECK ME -#%patch31 -p1 %patch32 -p1 %patch34 -p1 %patch35 -p0 %patch36 -p1 %patch37 -p1 -# CHECK ME -#%patch41 -p1 %patch42 -p1 -# CHECK ME, PROBABLY WILL NEED TO HANLE IN OTHER WAY since rpmfcSCRIPT already handles mono -#%patch46 -p1 +%patch46 -p1 %patch47 -p1 # OLD COMMENTED OUT -#%patch52 -p1 +#%%patch52 -p1 -- morearchs (rpmrc patch) adds ppc7400, ppc7400 %patch55 -p1 %patch58 -p1 %patch59 -p1 @@ -680,8 +704,8 @@ awk -f %{SOURCE6} %{SOURCE1} # 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} # 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}" \ @@ -690,7 +714,7 @@ awk -f %{SOURCE6} %{SOURCE1} %{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \ --enable-shared \ --enable-static \ - %{?with_python:--with-python=2.5 --with-python-lib-dir=%{py_libdir}} \ + %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \ %{!?with_python:--without-python} \ --with%{!?with_selinux:out}-selinux \ --with-libelf \ @@ -702,12 +726,12 @@ awk -f %{SOURCE6} %{SOURCE1} --with-popt=external \ --with-db=%{?with_db:external}%{!?with_db:no} \ --with-sqlite=%{?with_sqlite:external}%{!?with_sqlite:no} \ - --with-dbapi=%{!?sqlite_dbapi:db}%{?sqlite_dbapi:sqlite} \ - --with-lua=none \ - --with-pcre=external \ + --with-dbapi=%{!?with_sqlite_dbapi:db}%{?with_sqlite_dbapi:sqlite} \ + --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ + --with-pcre=no \ --with-keyutils=none \ --without-path-versioned \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \ + --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \ --with-bugreport="http://bugs.pld-linux.org/" %{__make} \ @@ -723,6 +747,33 @@ install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/ pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT +# install ARCH macros +install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux +install %{SOURCE105} $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 +%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 +%endif + +%ifarch %{ppc} +install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux +install %{SOURCE108} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros +%endif + # first platform file entry can't contain regexps echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform @@ -731,12 +782,10 @@ echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rp echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif - %ifarch amd64 echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif - %ifarch ia32e echo "ia32e-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform @@ -765,10 +814,41 @@ echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif -# ppc -%ifarch ppc -echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%ifarch alpha +echo "alpha-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +%ifarch ia64 +echo "ia64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +%ifarch ppc64 +echo "powerpc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "ppc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch %{ppc} ppc64 echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +%ifarch s390x +echo "s390x-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch s390 s390x +echo "s390-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +%ifarch sparc64 +echo "sparc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch sparcv9 +echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch sparc sparcv9 sparc64 +echo "sparc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif # noarch @@ -782,6 +862,7 @@ echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform 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 +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} @@ -806,7 +887,14 @@ install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh -install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo +install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo + +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 +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 <