[30926] trunk/dports/sysutils/rpm-devel

source_changes at macosforge.org source_changes at macosforge.org
Sun Nov 11 13:24:12 PST 2007


Revision: 30926
          http://trac.macosforge.org/projects/macports/changeset/30926
Author:   afb at macports.org
Date:     2007-11-11 13:24:11 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
* Update from CVS HEAD (20070821) to 5.0a1
- switch from the old python24 to python25
- move /usr/local/src/macports back to rpm

Modified Paths:
--------------
    trunk/dports/sysutils/rpm-devel/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/rpm-devel/files/patch-macros.in

Removed Paths:
-------------
    trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs
    trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm

Modified: trunk/dports/sysutils/rpm-devel/Portfile
===================================================================
--- trunk/dports/sysutils/rpm-devel/Portfile	2007-11-11 20:39:12 UTC (rev 30925)
+++ trunk/dports/sysutils/rpm-devel/Portfile	2007-11-11 21:24:11 UTC (rev 30926)
@@ -16,21 +16,21 @@
 
 homepage		http://rpm5.org
 master_sites		${homepage}/files/rpm/rpm-5.0
-#distname		rpm-${version}-0.2
-##distdate		20070618
-#checksums		md5 6fa9aebb436f2b50c625f183efa86250
-#worksrcdir		rpm-${version}
+distname		rpm-${version}a1
+#distdate		20071111
+checksums		md5 74d65a4e2fd07937cfcc9cebd583e133
+worksrcdir		rpm-${version}a1
 #
 ### CVS source
-fetch.type      	cvs
-cvs.root		:pserver:anonymous at rpm5.org:/cvs
-cvs.module		rpm
-#cvs.date		20070821
-cvs.tag			HEAD
-worksrcdir		rpm
+#fetch.type      	cvs
+#cvs.root		:pserver:anonymous at rpm5.org:/cvs
+#cvs.module		rpm
+##cvs.date		20071111
+#cvs.tag			HEAD
+#worksrcdir		rpm
 
 depends_build		port:expat port:neon \
-			port:python24 port:perl5.8 \
+			port:python25 port:perl5.8 \
 			port:readline port:beecrypt \
 			port:libiconv port:gettext
 
@@ -42,39 +42,27 @@
                         bin:bzip2:bzip2 \
                         bin:unzip:unzip
 
-#extract.suffix		.src.rpm
-#extract.cmd		${filespath}/rpm2cpio.pl
-#extract.pre_args
-#extract.post_args	| cpio -dvim rpm-${version}.tar.gz && \
-#			  gzip -dc rpm-${version}.tar.gz | tar -xf -
-#
-#patchfiles		patch-macros.in-rpm \
-#			patch-configure \
-#			patch-darwin.prov \
-#			patch-rpmevr.h \
-#			patch-fts.c \
-#			patch-rpmio.h
-#
-### CVS files
-patchfiles		patch-macros.in-cvs
+patchfiles		patch-macros.in \
+			patch-rpmevr.h
 
 build.type		gnu
 
 configure.args		--disable-nls --without-javaglue --without-included-gettext \
 			--with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
 			--mandir=${prefix}/share/man --infodir=${prefix}/share/info \
-			--with-python=2.4 --with-perl --without-apidocs \
-			--sysconfdir=${prefix}/etc
+			--with-python=2.5 --with-perl --with-sqlite --with-dbapi=sqlite \
+			--without-apidocs --sysconfdir=${prefix}/etc --with-path-cfg=${prefix}/etc/rpm
+configure.env		__PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl
 
 ### CVS config
-post-fetch	{ system "cd ${worksrcpath} && . devtool.bashrc && devtool checkout" }
-pre-configure	{ system "cd ${worksrcpath} && . devtool.bashrc && devtool autogen" }
-configure.args-append	--with-sqlite --with-dbapi=sqlite --with-path-cfg=${prefix}/etc/rpm \
-			--with-lua=internal --with-db=internal
+#post-fetch	{ system "cd ${worksrcpath} && . devtool.bashrc && devtool checkout" }
+#pre-configure	{ system "cd ${worksrcpath} && . devtool.bashrc && devtool autogen" }
 
+
+configure.args-append	--with-lua=internal --with-db=internal --with-xar=internal
+
 post-destroot {
 	# MacPorts specific changes
-	reinplace "s;%{_usr}/src/rpm;%{_usr}/src/macports;" ${destroot}${prefix}/lib/rpm/macros
 	reinplace "s;%{_topdir}/TR;%{_var}/spool/repackage;" ${destroot}${prefix}/lib/rpm/macros
 
 	xinstall -d -m 755 ${prefix}/etc/rpm
@@ -86,11 +74,11 @@
 	destroot.keepdirs ${destroot}${prefix}/etc/rpm\
 			  ${destroot}${prefix}/var/lib/rpm\
 			  ${destroot}${prefix}/var/spool/repackage\
-			  ${destroot}${prefix}/src/macports/BUILD\
-			  ${destroot}${prefix}/src/macports/RPMS\
-			  ${destroot}${prefix}/src/macports/SOURCES\
-			  ${destroot}${prefix}/src/macports/SPECS\
-			  ${destroot}${prefix}/src/macports/SRPMS
+			  ${destroot}${prefix}/src/rpm/BUILD\
+			  ${destroot}${prefix}/src/rpm/RPMS\
+			  ${destroot}${prefix}/src/rpm/SOURCES\
+			  ${destroot}${prefix}/src/rpm/SPECS\
+			  ${destroot}${prefix}/src/rpm/SRPMS
 }
 
 platform darwin {
@@ -98,9 +86,6 @@
 			      --with-glob --enable-broken-chown \
 			      --disable-rpath
 
-	configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include \
-	                          -I${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
-
 	post-destroot {
 		# Mac OS X specific changes
 		reinplace "s;\tlibtoolize;\tglibtoolize;" ${destroot}${prefix}/lib/rpm/macros

Copied: trunk/dports/sysutils/rpm-devel/files/patch-macros.in (from rev 30925, trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs)
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-macros.in	                        (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-macros.in	2007-11-11 21:24:11 UTC (rev 30926)
@@ -0,0 +1,106 @@
+--- macros.in.orig	2007-11-11 17:59:37.000000000 +0100
++++ macros.in	2007-11-11 21:16:12.000000000 +0100
+@@ -181,7 +181,7 @@
+ %_dbpath_rebuild	%{_dbpath}
+ 
+ #
+-#	Path to script that creates debug symbols in a /usr/lib/debug
++#	Path to script that creates debug symbols in a @prefix@/lib/debug
+ #	shadow tree.
+ #
+ #     A spec file can %%define _find_debuginfo_opts to pass options to
+@@ -304,7 +304,7 @@
+ 
+ #	The PATH put into the environment before running %pre/%post et al.
+ #
+-%_install_script_path	/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
++%_install_script_path	@prefix@/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
+ 
+ #	A colon separated list of desired locales to be installed;
+ #	"all" means install all locale specific files.
+@@ -748,7 +748,7 @@
+ # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
+ #
+ # XXX	Note: escaped %% for use in headerSprintf()
+-#%_hrmib_path	/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
++#%_hrmib_path	@prefix@/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
+ 
+ #==============================================================================
+ # ---- GPG/PGP/PGP5 signature macros.
+@@ -836,11 +836,11 @@
+ #	The path to the dependency universe database. The default value
+ #	is the rpmdb-vendor location. The macro is usually defined in
+ #	%{_etcrpm}/macros.solve, installed with the rpmdb-vendor package.
+-#%_solve_dbpath	/usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
++#%_solve_dbpath	@prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
+ 
+ #	The path to the dependency universe packages. This should
+ #	be a path to the packages contained in the solve database.
+-#%_solve_pkgsdir	/mnt/rpm/test/latest-i386/RedHat/RPMS/
++#%_solve_pkgsdir	@prefix@/src/%{_vendor}/RPMS/ppc
+ 
+ #	The output binary package file name template used when suggesting
+ #	binary packages that solve a dependency. The macro is usually defined
+@@ -986,7 +986,7 @@
+ %_rpmds_perldeps_cmd	%{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
+ 
+ #
+-%_varrun		/var/run
++%_varrun		@prefix@/var/run
+ 
+ #==============================================================================
+ # ---- Cache configuration macros.
+@@ -1011,7 +1011,7 @@
+ %_bhA           %{nil}
+ 
+ #	The cache database directory.
+-%_cache_dbpath		/var/cache/yum/rpmdb
++%_cache_dbpath		@prefix@/var/cache/yum/rpmdb
+ 
+ #==============================================================================
+ # ---- per-platform macros.
+@@ -1224,7 +1224,7 @@
+ %_lib			lib
+ %_libdir		%{_exec_prefix}/%{_lib}
+ %_includedir		%{_prefix}/include
+-%_oldincludedir		/usr/include
++%_oldincludedir		@prefix@/include
+ %_infodir		%{_prefix}/info
+ %_mandir		%{_prefix}/man
+ %_localedir		%{_datadir}/locale
+@@ -1489,7 +1489,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__java_provides	%{_rpmhome}/javadeps.sh --provides
+-%__java_requires	%{_rpmhome}/javadeps.sh --requires
++#%__java_requires	%{_rpmhome}/javadeps.sh --requires
+ 
+ #------------------------------------------------------------------------
+ # libtool(...) configuration.
+@@ -1499,7 +1499,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__libtool_provides	%{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
+-%__libtool_requires	%{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
++#%__libtool_requires	%{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
+ 
+ #------------------------------------------------------------------------
+ # pkgconfig(...) configuration.
+@@ -1509,7 +1509,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__pkgconfig_provides	%{_rpmhome}/pkgconfigdeps.sh --provides
+-%__pkgconfig_requires	%{_rpmhome}/pkgconfigdeps.sh --requires
++#%__pkgconfig_requires	%{_rpmhome}/pkgconfigdeps.sh --requires
+ 
+ #------------------------------------------------------------------------
+ # mono(...) configuration.
+@@ -1530,7 +1530,7 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__executable_provides	%{_rpmhome}/executabledeps.sh --provides
+ #%__executable_requires	%{_rpmhome}/executabledeps.sh --requires
+-%__scriptlet_requires	/bin/bash --rpm-requires
++#%__scriptlet_requires	/bin/bash --rpm-requires
+ 
+ # \endverbatim
+ #*/

Deleted: trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs	2007-11-11 20:39:12 UTC (rev 30925)
+++ trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs	2007-11-11 21:24:11 UTC (rev 30926)
@@ -1,106 +0,0 @@
---- macros.in.orig	2007-08-06 13:27:27.000000000 +0200
-+++ macros.in	2007-08-09 12:44:06.000000000 +0200
-@@ -181,7 +181,7 @@
- %_dbpath_rebuild	%{_dbpath}
- 
- #
--#	Path to script that creates debug symbols in a /usr/lib/debug
-+#	Path to script that creates debug symbols in a @prefix@/lib/debug
- #	shadow tree.
- %__debug_install_post   \
-    %{_rpmhome}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-@@ -300,7 +300,7 @@
- 
- #	The PATH put into the environment before running %pre/%post et al.
- #
--%_install_script_path	/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
-+%_install_script_path	@prefix@/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
- 
- #	A colon separated list of desired locales to be installed;
- #	"all" means install all locale specific files.
-@@ -737,7 +737,7 @@
- # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
- #
- # XXX	Note: escaped %% for use in headerSprintf()
--#%_hrmib_path	/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
-+#%_hrmib_path	@prefix@/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
- 
- #==============================================================================
- # ---- GPG/PGP/PGP5 signature macros.
-@@ -825,11 +825,11 @@
- #	The path to the dependency universe database. The default value
- #	is the rpmdb-vendor location. The macro is usually defined in
- #	%{_etcrpm}/macros.solve, installed with the rpmdb-vendor package.
--#%_solve_dbpath	/usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
-+#%_solve_dbpath	@prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
- 
- #	The path to the dependency universe packages. This should
- #	be a path to the packages contained in the solve database.
--#%_solve_pkgsdir	/mnt/rpm/test/latest-i386/RedHat/RPMS/
-+#%_solve_pkgsdir	@prefix@/src/%{_vendor}/RPMS/ppc
- 
- #	The output binary package file name template used when suggesting
- #	binary packages that solve a dependency. The macro is usually defined
-@@ -975,7 +975,7 @@
- %_rpmds_perldeps_cmd	%{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
- 
- #
--%_varrun		/var/run
-+%_varrun		@prefix@/var/run
- 
- #==============================================================================
- # ---- Cache configuration macros.
-@@ -1000,7 +1000,7 @@
- %_bhA           %{nil}
- 
- #	The cache database directory.
--%_cache_dbpath		/var/cache/yum/rpmdb
-+%_cache_dbpath		@prefix@/var/cache/yum/rpmdb
- 
- #==============================================================================
- # ---- per-platform macros.
-@@ -1213,7 +1213,7 @@
- %_lib			lib
- %_libdir		%{_exec_prefix}/%{_lib}
- %_includedir		%{_prefix}/include
--%_oldincludedir		/usr/include
-+%_oldincludedir		@prefix@/include
- %_infodir		%{_prefix}/info
- %_mandir		%{_prefix}/man
- %_localedir		%{_datadir}/locale
-@@ -1475,7 +1475,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__java_provides	%{_rpmhome}/javadeps.sh --provides
--%__java_requires	%{_rpmhome}/javadeps.sh --requires
-+#%__java_requires	%{_rpmhome}/javadeps.sh --requires
- 
- #------------------------------------------------------------------------
- # libtool(...) configuration.
-@@ -1485,7 +1485,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__libtool_provides	%{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
--%__libtool_requires	%{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
-+#%__libtool_requires	%{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
- 
- #------------------------------------------------------------------------
- # pkgconfig(...) configuration.
-@@ -1495,7 +1495,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__pkgconfig_provides	%{_rpmhome}/pkgconfigdeps.sh --provides
--%__pkgconfig_requires	%{_rpmhome}/pkgconfigdeps.sh --requires
-+#%__pkgconfig_requires	%{_rpmhome}/pkgconfigdeps.sh --requires
- 
- #------------------------------------------------------------------------
- # mono(...) configuration.
-@@ -1516,7 +1516,7 @@
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- #%__executable_provides	%{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires	%{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires	/bin/bash --rpm-requires
-+#%__scriptlet_requires	/bin/bash --rpm-requires
- 
- # \endverbatim
- #*/

Deleted: trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm	2007-11-11 20:39:12 UTC (rev 30925)
+++ trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm	2007-11-11 21:24:11 UTC (rev 30926)
@@ -1,137 +0,0 @@
---- macros.in.orig	2007-06-17 03:21:39.000000000 +0200
-+++ macros.in	2007-08-09 11:43:51.000000000 +0200
-@@ -181,7 +181,7 @@
- %_dbpath_rebuild	%{_dbpath}
- 
- #
--#	Path to script that creates debug symbols in a /usr/lib/debug
-+#	Path to script that creates debug symbols in a @prefix@/lib/debug
- #	shadow tree.
- %__debug_install_post   \
-    %{_rpmhome}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-@@ -300,7 +300,7 @@
- 
- #	The PATH put into the environment before running %pre/%post et al.
- #
--%_install_script_path	/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
-+%_install_script_path	@prefix@/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
- 
- #	A colon separated list of desired locales to be installed;
- #	"all" means install all locale specific files.
-@@ -629,7 +629,7 @@
-   %{!?_rpmdb_rebuild:%{__dbi_btconfig_current}}\
- %{nil}
- 
--%_dbi_tags      Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys:Packagecolor
-+%_dbi_tags      Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Pubkeys
- 
- %_dbi_config_Dirnames		%{_dbi_btconfig}
- %_dbi_config_Requireversion	%{_dbi_btconfig}
-@@ -662,17 +662,18 @@
- # XXX legacy configuration.
- # Choose db interface:
- #	3	native db3 interface.
-+#	4	new sqlite3 interface.
- #
- # There are two macros so that --rebuilddb can convert db1 -> db3.
- #
--%_dbapi			3
--%_dbapi_rebuild		3
-+%_dbapi			4
-+%_dbapi_rebuild		4
- 
- #
- # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
- #
- # XXX	Note: escaped %% for use in headerSprintf()
--%_hrmib_path	/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
-+%_hrmib_path	@prefix@/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
- 
- #==============================================================================
- # ---- GPG/PGP/PGP5 signature macros.
-@@ -760,11 +761,11 @@
- #	The path to the dependency universe database. The default value
- #	is the rpmdb-vendor location. The macro is usually defined in
- #	%{_etcrpm}/macros.solve, installed with the rpmdb-vendor package.
--#%_solve_dbpath	/usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
-+#%_solve_dbpath	@prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
- 
- #	The path to the dependency universe packages. This should
- #	be a path to the packages contained in the solve database.
--#%_solve_pkgsdir	/mnt/rpm/test/latest-i386/RedHat/RPMS/
-+#%_solve_pkgsdir	@prefix@/src/%{_vendor}/RPMS/ppc
- 
- #	The output binary package file name template used when suggesting
- #	binary packages that solve a dependency. The macro is usually defined
-@@ -781,7 +782,7 @@
- 
- #	The directory in which erased packages will be saved when using
- #	the --repackage option.
--%_repackage_dir		/var/spool/repackage
-+%_repackage_dir		@prefix@/var/spool/repackage
- 
- #	A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
- %_repackage_root	%{nil}
-@@ -912,7 +913,7 @@
- %_rpmds_perldeps_cmd	%{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
- 
- #
--%_varrun		/var/run
-+%_varrun		@prefix@/var/run
- 
- #==============================================================================
- # ---- Cache configuration macros.
-@@ -937,7 +938,7 @@
- %_bhA           %{nil}
- 
- #	The cache database directory.
--%_cache_dbpath		/var/cache/yum/rpmdb
-+%_cache_dbpath		@prefix@/var/cache/yum/rpmdb
- 
- #==============================================================================
- # ---- per-platform macros.
-@@ -1150,7 +1151,7 @@
- %_lib			lib
- %_libdir		%{_exec_prefix}/%{_lib}
- %_includedir		%{_prefix}/include
--%_oldincludedir		/usr/include
-+%_oldincludedir		@prefix@/include
- %_infodir		%{_prefix}/info
- %_mandir		%{_prefix}/man
- %_localedir		%{_datadir}/locale
-@@ -1412,7 +1413,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__java_provides	%{_rpmhome}/javadeps.sh --provides
--%__java_requires	%{_rpmhome}/javadeps.sh --requires
-+#%__java_requires	%{_rpmhome}/javadeps.sh --requires
- 
- #------------------------------------------------------------------------
- # libtool(...) configuration.
-@@ -1422,7 +1423,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__libtool_provides	%{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
--%__libtool_requires	%{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
-+#%__libtool_requires	%{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
- 
- #------------------------------------------------------------------------
- # pkgconfig(...) configuration.
-@@ -1432,7 +1433,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__pkgconfig_provides	%{_rpmhome}/pkgconfigdeps.sh --provides
--%__pkgconfig_requires	%{_rpmhome}/pkgconfigdeps.sh --requires
-+#%__pkgconfig_requires	%{_rpmhome}/pkgconfigdeps.sh --requires
- 
- #------------------------------------------------------------------------
- # executable(...) configuration.
-@@ -1443,7 +1444,7 @@
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- #%__executable_provides	%{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires	%{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires	/bin/bash --rpm-requires
-+#%__scriptlet_requires	/bin/bash --rpm-requires
- 
- # \endverbatim
- #*/

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071111/41b36fd1/attachment.html


More information about the macports-changes mailing list