From a09cc967ee127d906243882abf28be5630b3a309 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Aug 01 2013 13:12:15 +0000
Subject: - Update to 1.2.0

- rebuild for new librabbitmq
- cleanups
- LICENSE now provided in upstream tarball
- add extension version check

---

diff --git a/.gitignore b/.gitignore
index 3c81e16..02a8e06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,9 @@
+*spec~
+package-*.xml
 /amqp-1.0.1.tgz
+/amqp-1.0.3.tgz
+/amqp-1.0.4.tgz
+/amqp-1.0.5.tgz
+/amqp-1.0.7.tgz
+/amqp-1.0.9.tgz
+/amqp-1.2.0.tgz
diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index f846474..94bbc38 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -4,19 +4,13 @@
 
 Summary:       Communicate with any AMQP compliant server
 Name:          php-pecl-amqp
-Version:       1.0.1
-Release:       3%{?dist}
-# https://bugs.php.net/61337 - missing LICENSE file
+Version:       1.2.0
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/amqp
 Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-# http://svn.php.net/viewvc?view=revision&revision=324074
-Patch0:        %{pecl_name}-php54.patch
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-# https://bugs.php.net/61351 - Should requires PHP > 5.2.0
 BuildRequires: php-devel > 5.2.0
 BuildRequires: php-pear
 BuildRequires: librabbitmq-devel
@@ -25,14 +19,15 @@ Requires:         php(zend-abi) = %{php_zend_api}
 Requires:         php(api) = %{php_core_api}
 Requires(post):   %{__pecl}
 Requires(postun): %{__pecl}
-Provides:         php-pecl(%{pecl_name}) = %{version}-%{release}
 
+Provides:         php-%{pecl_name} = %{version}
+Provides:         php-%{pecl_name}%{?_isa} = %{version}
+Provides:         php-pecl(%{pecl_name}) = %{version}
+Provides:         php-pecl(%{pecl_name})%{?_isa} = %{version}
 
-# RPM 4.8
+# filter private shared
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
 %{?filter_setup}
-# RPM 4.9
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
 
 
 %description
@@ -45,7 +40,15 @@ from any queue.
 %prep
 %setup -q -c
 
-%patch0 -p0 -b php54
+cd %{pecl_name}-%{version}
+
+# Upstream often forget to change this
+extver=$(sed -n '/#define PHP_AMQP_VERSION/{s/.* "//;s/".*$//;p}' php_amqp.h)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream version is ${extver}, expecting %{version}.
+   exit 1
+fi
+cd ..
 
 cat > %{pecl_name}.ini << 'EOF'
 ; Enable %{pecl_name} extension module
@@ -89,7 +92,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 make -C %{pecl_name}-%{version} \
      install INSTALL_ROOT=%{buildroot}
 
@@ -108,10 +110,6 @@ php --no-php-ini \
     -m | grep %{pecl_name}
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
 
@@ -123,20 +121,23 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
-%doc %{pecl_name}-%{version}/CREDITS
+%doc %{pecl_name}-%{version}/{CREDITS,LICENSE}
 %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
 %{pecl_xmldir}/%{name}.xml
 
 
 %changelog
+* Thu Aug  1 2013 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
+- Update to 1.2.0
+- rebuild for new librabbitmq
+- cleanups
+- LICENSE now provided in upstream tarball
+- add extension version check
+
 * Mon Mar 19 2012 Remi Collet <remi@fedoraproject.org> - 1.0.1-3
 - clean EL-5 stuff as requires php 5.2.0, https://bugs.php.net/61351
 
-* Sat Mar 10 2012 Remi Collet <remi@fedoraproject.org> - 1.0.1-2
-- rebuild for PHP 5.4
-
 * Sat Mar 10 2012 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
 - Initial RPM release without ZTS extension
 - open request for LICENSE file https://bugs.php.net/61337
diff --git a/sources b/sources
index 470a8aa..e3620ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5b4a85551a03e0754c6cf01a5ad5200  amqp-1.0.1.tgz
+f8dc4903189d3fe7e08a2d381ff92df0  amqp-1.2.0.tgz