Better file relocation and invert post/postun logic

diff --git a/pear/template.spec b/pear/template.spec
index dc6c66550ea9c32d461cbcf0c796d7edef871b14..9bf356c7f5a62cf5b527c09e768108fb80a4a29e 100644 (file)
--- a/pear/template.spec
+++ b/pear/template.spec
@@ -8,7 +8,7 @@ Source: http://@master_server@/get/@package@-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://@master_server@/
 Prefix: %{_prefix}
-Docdir: @doc_dir@/@package@
+#Docdir: @doc_dir@/@package@
 BuildArchitectures: @arch@
 @extra_headers@
 
@@ -16,29 +16,49 @@ BuildArchitectures: @arch@
 @description@
 
 %prep
-#rm -rf Console_Getopt-%{version} package.xml
-#mkdir -p Console_Getopt-%{version}
-#ln -s Console_Getopt-%{version}/package.xml package.xml
-%setup -q -D -n @package@-%{version}
-mv ../package.xml .
+rm -rf %{buildroot}/*
+# XXX Source files location is missing here in pear cmd
+pear -v -c %{buildroot}/pearrc \
+        -d php_dir=%{_libdir}/php/pear \
+        -d doc_dir=/docs \
+        -d bin_dir=%{_bindir} \
+        -d data_dir=%{_libdir}/php/pear/data \
+        -d test_dir=%{_libdir}/php/pear/tests \
+        -d ext_dir=%{_libdir} \
+        -s
 
 %build
 echo BuildRoot=%{buildroot}
 
-%post
+%postun
 pear uninstall --nodeps -r @package@
+rm @rpm_xml_dir@/@package@.xml
 
-%postun
+%post
 pear install --nodeps -r @rpm_xml_dir@/@package@.xml
 
 %install
-rm -rf %{buildroot}/*
-pear -q install -R %{buildroot} -n package.xml
+pear -c %{buildroot}/pearrc install --nodeps -R %{buildroot} \
+        $RPM_SOURCE_DIR/@package@-%{version}.tgz
+rm %{buildroot}/pearrc
+rm %{buildroot}/%{_libdir}/php/pear/.filemap
+rm %{buildroot}/%{_libdir}/php/pear/.lock
+rm -rf %{buildroot}/%{_libdir}/php/pear/.registry
+if [ -d "%{buildroot}/docs/@package@/doc" ]; then
+    rm -rf $RPM_BUILD_DIR/doc
+    mv %{buildroot}/docs/@package@/doc $RPM_BUILD_DIR
+    rm -rf %{buildroot}/docs
+fi
 mkdir -p %{buildroot}@rpm_xml_dir@
+tar -xzf $RPM_SOURCE_DIR/@package@-%{version}.tgz package.xml
 cp -p package.xml %{buildroot}@rpm_xml_dir@/@package@.xml
 
+#rm -rf %{buildroot}/*
+#pear -q install -R %{buildroot} -n package.xml
+#mkdir -p %{buildroot}@rpm_xml_dir@
+#cp -p package.xml %{buildroot}@rpm_xml_dir@/@package@.xml
+
 %files
-%defattr(-,root,root)
-%doc @doc_files@
-@files@
-@rpm_xml_dir@/@package@.xml
+    %defattr(-,root,root)
+    %doc @doc_files@
+    /