packages (rpm-4_5): rpm/rpm.spec, rpm/pythondeps-speedup.patch (NEW) - spee...
glen
glen at pld-linux.org
Sun Mar 21 13:21:08 CET 2010
Author: glen Date: Sun Mar 21 12:21:08 2010 GMT
Module: packages Tag: rpm-4_5
---- Log message:
- speedup python deps generating by elimiating repeating calls to obtain python version; rel 37
---- Files affected:
packages/rpm:
rpm.spec (1.837.2.42.2.49.2.85 -> 1.837.2.42.2.49.2.86) , pythondeps-speedup.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.85 packages/rpm/rpm.spec:1.837.2.42.2.49.2.86
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.85 Wed Mar 10 22:55:15 2010
+++ packages/rpm/rpm.spec Sun Mar 21 13:21:02 2010
@@ -57,7 +57,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 36
+Release: 37
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -178,6 +178,7 @@
Patch99: %{name}-pkgconfig.patch
Patch100: %{name}-rpm5-debugedit.patch
Patch101: %{name}-builddir-readlink.patch
+Patch102: pythondeps-speedup.patch
URL: http://rpm5.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1.4
@@ -805,6 +806,7 @@
%patch53 -p1
%patch100 -p1
%patch101 -p1
+%patch102 -p1
mv -f po/{sr,sr at Latn}.po
rm -rf sqlite zlib popt
@@ -1012,31 +1014,29 @@
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 -p 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 %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
-install %{SOURCE19} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer
-
-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 %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
-install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
-install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
-install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
-install %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm
-
-install %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
+cp -a macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
+cp -a macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
+cp -a macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
+cp -a macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
+cp -a %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
+cp -a %{SOURCE19} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer
+
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
+install -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
+install -p %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
+install -p %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
+install -p scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
+install -p %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
+cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm
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 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos
+cp -a %{SOURCE12} $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
@@ -1196,6 +1196,7 @@
rm -rf manual
cp -a doc/manual manual
+cp -a %{SOURCE1} manual/groups
rm -f manual/Makefile*
%clean
@@ -1460,6 +1461,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.86 2010/03/21 12:21:02 glen
+- speedup python deps generating by elimiating repeating calls to obtain python version; rel 37
+
Revision 1.837.2.42.2.49.2.85 2010/03/10 21:55:15 glen
- make defaults reverse of default for ease comment out and go
================================================================
Index: packages/rpm/pythondeps-speedup.patch
diff -u /dev/null packages/rpm/pythondeps-speedup.patch:1.1.2.1
--- /dev/null Sun Mar 21 13:21:08 2010
+++ packages/rpm/pythondeps-speedup.patch Sun Mar 21 13:21:02 2010
@@ -0,0 +1,25 @@
+--- rpm-4.5/scripts/pythondeps.sh 2007-05-25 20:36:39.000000000 +0300
++++ rpm-4.5/scripts/pythondeps.sh 2010-03-21 14:07:18.049336515 +0200
+@@ -5,7 +5,8 @@
+ exit 0
+ }
+
+-PYVER=`python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v"`
++# $PYVER is exported by rpm macro
++PYVER=${PYVER:-$(python -c "import sys; print '%d.%d' % sys.version_info[:2]")}
+ case $1 in
+ -P|--provides)
+ shift
+--- rpm-4.5/macros.in~ 2010-03-21 14:03:42.559283734 +0200
++++ rpm-4.5/macros.in 2010-03-21 14:05:18.419287370 +0200
+@@ -1401,8 +1401,8 @@
+ #
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-%__python_provides %{_rpmhome}/pythondeps.sh --provides
+-%__python_requires %{_rpmhome}/pythondeps.sh --requires
++%__python_provides /usr/bin/env PYVER=%py_ver %{_rpmhome}/pythondeps.sh --provides
++%__python_requires /usr/bin/env PYVER=%py_ver %{_rpmhome}/pythondeps.sh --requires
+
+ # Useful macros for building *.rpm python packages (for python > 1.6).
+ #
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.85&r2=1.837.2.42.2.49.2.86&f=u
More information about the pld-cvs-commit
mailing list