remi pushed to php-theseer-fDOMDocument (epel7). "- Update to 1.6.0 (..more)"

[notifications at fedoraproject.org]

>From cf19b59860643e9363753a3a4b5fff99cfab8fc6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 27 Mar 2015 07:25:13 +0100
Subject: - Update to 1.6.0 - switch from pear to github sources - provide
 php-composer(theseer/fdomdocument)


diff --git a/.gitignore b/.gitignore
index b559eb5..8a0f99e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ package-*.xml
 /fDOMDocument-1.4.2.tgz
 /fDOMDocument-1.4.3.tgz
 /fDOMDocument-1.5.0.tgz
+/fDOMDocument-1.6.0.tgz
+/fDOMDocument-1.6.0.tar.gz
diff --git a/php-theseer-fDOMDocument.spec b/php-theseer-fDOMDocument.spec
index df3fc02..b82a01e 100644
--- a/php-theseer-fDOMDocument.spec
+++ b/php-theseer-fDOMDocument.spec
@@ -7,43 +7,44 @@
 # Please, preserve the changelog entries
 #
 
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %global __pear %{_bindir}/pear}
-%global pear_name fDOMDocument
-%global channel   pear.netpirates.net
+%global gh_commit    d08cf070350f884c63fc9078d27893c2ab6c7cef
+%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner     theseer
+%global gh_project   fDOMDocument
+%global php_home     %{_datadir}/php/TheSeer
+%global pear_name    fDOMDocument
+%global pear_channel pear.netpirates.net
 
 Name:           php-theseer-fDOMDocument
-Version:        1.5.0
-Release:        1%{?dist}
+Version:        1.6.0
+Release:        2%{?dist}
 Summary:        An Extension to PHP standard DOM
 
 Group:          Development/Libraries
 License:        BSD
-URL:            https://github.com/theseer/fDOMDocument
-Source0:        http://%{channel}/get/%{pear_name}-%{version}.tgz
+URL:            https://github.com/%{gh_owner}/%{gh_project}
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.3
-BuildRequires:  php-pear(PEAR) >= 1.9.1
-BuildRequires:  php-channel(%{channel})
 # For test
-BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires:  %{_bindir}/phpunit
 BuildRequires:  php-dom
 BuildRequires:  php-libxml
 
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
-# From from package.xml, required
+# From composer.json, requires
+#        "php": ">=5.3.3",
+#        "ext-dom": "*",
+#        "lib-libxml": "*"
 Requires:       php(language) >= 5.3.3
 Requires:       php-dom
 Requires:       php-libxml
-Requires:       php-pear(PEAR) >= 1.9.1
-Requires:       php-channel(%{channel})
-# From phpcompatinfo report for version 1.5.0
+# From phpcompatinfo report for version 1.6.0
 Requires:       php-pcre
 Requires:       php-spl
 
-Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(theseer/fdomdocument) = %{version}
 
 
 %description
@@ -52,58 +53,42 @@ and exceptions by default
 
 
 %prep
-%setup -q -c
-
-# Package.xml is V2
-mv package.xml %{pear_name}-%{version}/%{name}.xml
+%setup -q -n %{gh_project}-%{gh_commit}
 
 
 %build
-cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}
-
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
-
-# Clean up unnecessary files
-rm -rf %{buildroot}%{pear_metadir}/.??*
-
-# Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+mkdir -p   %{buildroot}%{php_home}
+cp -pr src %{buildroot}%{php_home}/%{gh_project}
 
 
 %check
-cd %{pear_name}-%{version}
-sed -e s:autoload:TheSeer/fDOMDocument/autoload: \
-    phpunit.xml.dist >phpunit.xml
-phpunit -d date.timezone=UTC
+phpunit
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only \
-  %{pear_xmldir}/%{name}.xml >/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
-  %{__pear} uninstall --nodeps --ignore-errors --register-only \
-    %{channel}/%{pear_name} >/dev/null || :
+if [ -x %{_bindir}/pear ]; then
+  %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
+      %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
 
 %files
-%doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{name}.xml
-%dir %{pear_phpdir}/TheSeer
-%{pear_phpdir}/TheSeer/%{pear_name}
-%{pear_testdir}/%{pear_name}
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.md composer.json
+%{php_home}/%{gh_project}
 
 
 %changelog
+* Wed Nov 26 2014 Remi Collet <remi at fedoraproject.org> - 1.6.0-2
+- switch from pear to github sources
+- Update to 1.6.0
+- provide php-composer(theseer/fdomdocument)
+
 * Wed Feb 19 2014 Remi Collet <remi at fedoraproject.org> - 1.5.0-1
 - Update to 1.5.0
 
diff --git a/sources b/sources
index 0a3acac..4e10c4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-457e58c1babe379d9c5e1fa61e910a4e  fDOMDocument-1.5.0.tgz
+fcadc493b0467108d4626c5166e6f329  fDOMDocument-1.6.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-theseer-fDOMDocument.git/commit/?h=epel7&id=cf19b59860643e9363753a3a4b5fff99cfab8fc6