fedora-rpmdevtools configure.ac, 1.3, 1.4 rpmdev-newspec, 1.3, 1.4 rpmdevtools.spec, 1.15, 1.16 spectemplate-php-pear.spec, 1.4, 1.5

Sat Sep 9 17:04:21 UTC 2006

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18789

Modified Files:
	configure.ac rpmdev-newspec rpmdevtools.spec 
	spectemplate-php-pear.spec 
Log Message:
More php-pear spec template improvements, prepare for 5.1.


Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- configure.ac	17 Jul 2006 20:02:10 -0000	1.3
+++ configure.ac	9 Sep 2006 17:04:18 -0000	1.4
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 5.0)
+AC_INIT(rpmdevtools, 5.1)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG(HELP2MAN,help2man)
 AC_PATH_PROG(WGET,wget)


Index: rpmdev-newspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-newspec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmdev-newspec	4 Sep 2006 16:16:15 -0000	1.3
+++ rpmdev-newspec	9 Sep 2006 17:04:18 -0000	1.4
@@ -62,11 +62,7 @@
         php-pear-*)
             spectype=php-pear
             pearname="$(echo ${appname##php-pear-} | tr - _)"
-            basepeardir="$(echo $pearname | cut -f 1 -d _)"
-            peardirpath="$(echo $pearname | tr _ /)"
-            specfilter="; s|^\\(.*\\)Foo_Bar\\(.*\\)|\1$pearname\2| \
-              ; s|^\\(%{pear_phpdir}/\\)Foo|\1$basepeardir| \
-              ; s|^\\(%{pear_phpdir}/\\)$pearname\\(.php\\)|\1$peardirpath\2|"
+            specfilter="; s/\\bFoo_Bar\\b/$pearname/"
             ;;
         [Pp]y*)
             spectype=python


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmdevtools.spec	4 Sep 2006 16:16:15 -0000	1.15
+++ rpmdevtools.spec	9 Sep 2006 17:04:18 -0000	1.16
@@ -3,8 +3,8 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.0
-Release:        3%{?dist}
+Version:        5.1
+Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
@@ -120,8 +120,9 @@
 
 
 %changelog
-* Mon Sep  4 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 5.0-3
-- Re-add PHP PEAR spec template (#198706).
+* Sat Sep  9 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 5.1-1
+- Re-add PHP PEAR spec template, more improvements to it (#198706,
+  Christopher Stone, Remi Collet).
 
 * Tue Aug 22 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 5.0-2
 - Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools.


Index: spectemplate-php-pear.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-php-pear.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spectemplate-php-pear.spec	6 Sep 2006 16:10:13 -0000	1.4
+++ spectemplate-php-pear.spec	9 Sep 2006 17:04:18 -0000	1.5
@@ -1,4 +1,5 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Foo_Bar
 
 Name:           
 Version:        
@@ -8,7 +9,7 @@
 Group:          
 License:        
 URL:            http://pear.php.net/package/Foo_Bar
-Source0:        http://pear.php.net/get/Foo_Bar-%{version}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,7 +17,7 @@
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(Foo_Bar) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}
 
 %description
 
@@ -24,18 +25,19 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Foo_Bar-%{version}/Foo_Bar.xml
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd Foo_Bar-%{version}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd Foo_Bar-%{version}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT Foo_Bar.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -46,7 +48,7 @@
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 Foo_Bar.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -55,23 +57,23 @@
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/Foo_Bar.xml >/dev/null || :
+    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        Foo_Bar >/dev/null || :
+        %{pear_name} >/dev/null || :
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc Foo_Bar-%{version}/docdir/Foo_Bar/*
-%{pear_xmldir}/Foo_Bar.xml
-%{pear_testdir}/Foo_Bar
-%{pear_datadir}/Foo_Bar
-%{pear_phpdir}/Foo
-%{pear_phpdir}/Foo_Bar.php
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%{pear_xmldir}/%{pear_name}.xml
+%{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
+# Expand this as needed to avoid owning dirs owned by our dependencies
+%{pear_phpdir}/*
 
 
 %changelog


