rpms/php-pear-PEAR-Command-Packaging/devel php-pear-PEAR-Command-Packaging-fedora-template-specfile, 1.2, 1.3 php-pear-PEAR-Command-Packaging.spec, 1.4, 1.5
Remi Collet
remi at fedoraproject.org
Sun Jul 19 12:37:15 UTC 2009
Author: remi
Update of /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30121
Modified Files:
php-pear-PEAR-Command-Packaging-fedora-template-specfile
php-pear-PEAR-Command-Packaging.spec
Log Message:
change %{pear-name}.xml to %{name}.xml (Fedora PHP Guidelines)
Index: php-pear-PEAR-Command-Packaging-fedora-template-specfile
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/devel/php-pear-PEAR-Command-Packaging-fedora-template-specfile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-PEAR-Command-Packaging-fedora-template-specfile 27 Jun 2009 22:06:10 -0000 1.2
+++ php-pear-PEAR-Command-Packaging-fedora-template-specfile 19 Jul 2009 12:36:45 -0000 1.3
@@ -25,7 +25,7 @@ Provides: php-pear(%{pear_name}) =
%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
@@ -37,7 +37,7 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
@doc_files_relocation_script@
@@ -46,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%clean
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+ %{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
@@ -69,8 +69,9 @@ fi
@doc_files_statement@
@cfg_files_statement@
@www_files_statement@
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
# Expand this as needed to avoid owning dirs owned by our dependencies
+# and to avoid unowned dirs
@php_files_statement@
@data_files_statement@
@test_files_statement@
Index: php-pear-PEAR-Command-Packaging.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/devel/php-pear-PEAR-Command-Packaging.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-PEAR-Command-Packaging.spec 27 Jun 2009 22:06:10 -0000 1.4
+++ php-pear-PEAR-Command-Packaging.spec 19 Jul 2009 12:36:45 -0000 1.5
@@ -3,7 +3,7 @@
Name: php-pear-PEAR-Command-Packaging
Version: 0.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Create RPM spec files from PEAR modules
Group: Development/System
@@ -29,7 +29,7 @@ a later date.
%prep
%setup -q -c
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%build
@@ -38,7 +38,7 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Patches for Fedora conventions
pushd $RPM_BUILD_ROOT%{pear_phpdir}/PEAR/Command/
@@ -54,7 +54,7 @@ rm -f $RPM_BUILD_ROOT%{pear_docdir}/%{pe
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%clean
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+ %{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
@@ -74,12 +74,15 @@ fi
%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/LICENSE
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/PEAR/Command/Packaging.*
%changelog
+* Sun Jul 19 2009 Remi Collet <Fedora at FamilleCollet.com> 0.2.0-2
+- change %%{pear-name}.xml to %%{name}.xml
+
* Sat Jun 27 2009 Tim Jackson <rpm at timj.co.uk> 0.2.0-1
- Update to 0.2.0
More information about the fedora-extras-commits
mailing list