fedora-rpmdevtools spectemplate-php-pear.spec,1.3,1.4

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	spectemplate-php-pear.spec 
Log Message:
Changes from #198706 comments 29 and 30.


Index: spectemplate-php-pear.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-php-pear.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spectemplate-php-pear.spec	4 Sep 2006 16:16:15 -0000	1.3
+++ spectemplate-php-pear.spec	6 Sep 2006 16:10:13 -0000	1.4
@@ -22,16 +22,20 @@
 
 
 %prep
-%setup -q -n Foo_Bar-%{version}
-mv ../package.xml .
+%setup -q -c
+[ -f package2.xml ] || mv package.xml package2.xml
+mv package2.xml Foo_Bar-%{version}/Foo_Bar.xml
 
 
 %build
+cd Foo_Bar-%{version}
+# Empty build section, most likely nothing required.
 
 
 %install
+cd Foo_Bar-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT package.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT Foo_Bar.xml
 
 # Move documentation
 mkdir -p docdir
@@ -42,7 +46,7 @@
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 package.xml $RPM_BUILD_ROOT%{pear_xmldir}/Foo_Bar.xml
+install -pm 644 Foo_Bar.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -62,7 +66,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docdir/Foo_Bar/*
+%doc Foo_Bar-%{version}/docdir/Foo_Bar/*
 %{pear_xmldir}/Foo_Bar.xml
 %{pear_testdir}/Foo_Bar
 %{pear_datadir}/Foo_Bar