From bbc5e264474a54eb0192fb6b773d33769670c789 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Aug 07 2013 13:12:55 +0000
Subject: - Update to 0.5.0

- strip sources from non-free stuff (fonts)

---

diff --git a/.gitignore b/.gitignore
index dde920e..118411b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /Text_CAPTCHA-0.4.4.tgz
 /Text_CAPTCHA-0.4.5.tgz
 /Text_CAPTCHA-0.4.6.tgz
+/Text_CAPTCHA-0.5.0-strip.tgz
diff --git a/php-pear-Text-CAPTCHA.spec b/php-pear-Text-CAPTCHA.spec
index 04d6fd5..79d327e 100644
--- a/php-pear-Text-CAPTCHA.spec
+++ b/php-pear-Text-CAPTCHA.spec
@@ -1,18 +1,29 @@
+# spec file for php-pear-Text-CAPTCHA
+#
+# Copyright (c) 2013 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Text_CAPTCHA
 
 Name:           php-pear-Text-CAPTCHA
-Version:        0.4.6
-Release:        2%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Generation of CAPTCHAs
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Text_CAPTCHA
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+# remove tests which use non-free stuff (fonts)
+# pear download Text_CAPTCHA-%{version}
+# ./strip.sh %{version}
+Source0:        %{pear_name}-%{version}-strip.tgz
+Source1:        strip.sh
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR)
 
@@ -20,11 +31,11 @@ Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-gd
 Requires:       php-pear(PEAR)
-Requires:       php-pear(Text_Password)
+Requires:       php-pear(Text_Password) >= 1.1.1
 # Optional
 Requires:       php-pear(Numbers_Words)
 Requires:       php-pear(Text_Figlet)
-Requires:       php-pear(Image_Text)
+Requires:       php-pear(Image_Text) >= 0.7.0
 
 Provides:       php-pear(%{pear_name}) = %{version}
 
@@ -37,11 +48,7 @@ computers and humans apart)
 %setup -q -c
 
 cd %{pear_name}-%{version}
-# fix wrong-file-end-of-line-encoding
-sed -e 's/\r//' -i examples/CAPTCHA_Word_test.php
-# remove checksum for altered file
-sed -e '/CAPTCHA_Word_test.php/s/md5sum.*name/name/' \
-    ../package.xml >%{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -50,7 +57,6 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf %{buildroot}
 cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -62,10 +68,6 @@ mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -78,7 +80,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Text/CAPTCHA
@@ -86,6 +87,10 @@ fi
 
 
 %changelog
+* Wed Aug 07 2013 Remi Collet <remi@fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+- strip sources from non-free stuff (fonts)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index e305d7a..30cb91c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e60dba7f18713c4bc3628abf29e5199e  Text_CAPTCHA-0.4.6.tgz
+e1828a2c3ea9c651e9831f62824337dc  Text_CAPTCHA-0.5.0-strip.tgz
diff --git a/strip.sh b/strip.sh
new file mode 100755
index 0000000..35126de
--- /dev/null
+++ b/strip.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+name=Text_CAPTCHA
+list=$(mktemp)
+
+if [ -f $name-$1.tgz ]
+then
+	tar xif $name-$1.tgz
+	tar tf $name-$1.tgz >$list.old
+
+	rm -r $name-$1/tests
+	sed -e '/tests/d' -i package.xml
+
+	tar czf $name-$1-strip.tgz package.xml $name-$1
+	tar tf $name-$1-strip.tgz | grep -v '/$' >$list.new
+
+	diff $list.old $list.new
+	rm -rf $name-$1 package.xml
+else
+	echo "usage $0 <version>"
+fi
+rm -f  $list*