fedora-rpmdevtools spectemplate-php-pear.spec, 1.2, 1.3 Makefile.am, 1.8, 1.9 rpmdev-newspec, 1.2, 1.3 rpmdevtools.spec, 1.14, 1.15

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	Makefile.am rpmdev-newspec rpmdevtools.spec 
Added Files:
	spectemplate-php-pear.spec 
Log Message:
Re-add PHP PEAR spec template (#198706).


Index: spectemplate-php-pear.spec
===================================================================
RCS file: spectemplate-php-pear.spec
diff -N spectemplate-php-pear.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ spectemplate-php-pear.spec	4 Sep 2006 16:16:15 -0000	1.3
@@ -0,0 +1,73 @@
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+
+Name:           
+Version:        
+Release:        1%{?dist}
+Summary:        
+
+Group:          
+License:        
+URL:            http://pear.php.net/package/Foo_Bar
+Source0:        http://pear.php.net/get/Foo_Bar-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  php-pear >= 1:1.4.9-1.2
+Requires:       php-pear(PEAR)
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
+Provides:       php-pear(Foo_Bar) = %{version}
+
+%description
+
+
+%prep
+%setup -q -n Foo_Bar-%{version}
+mv ../package.xml .
+
+
+%build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT docdir
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT package.xml
+
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
+# Clean up unnecessary files
+rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+
+# Install XML package description
+mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 package.xml $RPM_BUILD_ROOT%{pear_xmldir}/Foo_Bar.xml
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+%{__pear} install --nodeps --soft --force --register-only \
+    %{pear_xmldir}/Foo_Bar.xml >/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    %{__pear} uninstall --nodeps --ignore-errors --register-only \
+        Foo_Bar >/dev/null || :
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc docdir/Foo_Bar/*
+%{pear_xmldir}/Foo_Bar.xml
+%{pear_testdir}/Foo_Bar
+%{pear_datadir}/Foo_Bar
+%{pear_phpdir}/Foo
+%{pear_phpdir}/Foo_Bar.php
+
+
+%changelog


Index: Makefile.am
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	20 Aug 2006 19:05:41 -0000	1.8
+++ Makefile.am	4 Sep 2006 16:16:15 -0000	1.9
@@ -16,8 +16,8 @@
 dist_pkgdata_DATA = template.init
 
 dist_pkgsysconf_DATA = spectemplate-lib.spec spectemplate-minimal.spec \
-	spectemplate-perl.spec spectemplate-python.spec \
-	spectemplate-ruby.spec rmdevelrpms.conf 
+	spectemplate-perl.spec spectemplate-php-pear.spec \
+	spectemplate-python.spec spectemplate-ruby.spec rmdevelrpms.conf
 
 dist_rpmlib_SCRIPTS = check-buildroot check-rpaths check-rpaths-worker
 


Index: rpmdev-newspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-newspec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmdev-newspec	20 Aug 2006 19:05:41 -0000	1.2
+++ rpmdev-newspec	4 Sep 2006 16:16:15 -0000	1.3
@@ -59,6 +59,15 @@
             specfilter="; s/^%setup.*/%setup -q -n $cpandist-%{version}/ \
                ; s|^\\(URL:\\s*\\).*|\1http://search.cpan.org/dist/$cpandist/|"
             ;;
+        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|"
+            ;;
         [Pp]y*)
             spectype=python
             ;;


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rpmdevtools.spec	22 Aug 2006 19:26:28 -0000	1.14
+++ rpmdevtools.spec	4 Sep 2006 16:16:15 -0000	1.15
@@ -4,7 +4,7 @@
 
 Name:           rpmdevtools
 Version:        5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Mon Sep  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.0-3
+- Re-add PHP PEAR spec template (#198706).
+
 * Tue Aug 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.0-2
 - Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools.