rpms/txt2regex/devel txt2regex.spec,1.1,1.2

[richardfearn]

Author: richardfearn

Update of /cvs/pkgs/rpms/txt2regex/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5602

Modified Files:
	txt2regex.spec 
Log Message:
update to 0.8-2



Index: txt2regex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/txt2regex/devel/txt2regex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- txt2regex.spec	19 Jul 2010 17:16:00 -0000	1.1
+++ txt2regex.spec	19 Jul 2010 17:23:57 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           txt2regex
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regular expression wizard that converts human sentences to regexes
 
 Group:          Applications/Text
-License:        GPLv2+
+License:        GPLv2
 URL:            http://www.aurelio.net/soft/txt2regex/
 Source0:        http://txt2regex.sourceforge.net/txt2regex-%{version}.tgz
 
@@ -19,32 +19,33 @@ BuildRequires:  gettext
 Requires:       bash >= 2.04
 
 %description
-Txt2regex is a Regular Expression wizard that converts human sentences to
+txt2regex is a regular expression wizard that converts human sentences to
 regexes.
 
-In a simple interactive interface, you just answer to questions and build your
-own regex for a large variety of softwares and programming languages: AWK, ed,
-egrep, Emacs, expect, find, gawk, grep, lex, lisp, mawk, MySQL, OpenOffice.org,
-Perl, PHP, Postgres, Procmail, Python, SED, Tcl, VBscript, VI, Vim.
+In a simple interactive interface, you just answer questions and build your
+own regex for a large variety of software and programming languages.
 
 %prep
 %setup -q
 %patch0 -p1
 
-%build
+# upstream has confirmed that txt2regex is GPLv2 only
+for i in README txt2regex-0.8.sh; do \
+  cp -p $i $i.new; \
+  sed -i -e 's/GPL/GPLv2/' $i.new; \
+  touch -r $i $i.new; \
+  mv -f $i.new $i; \
+done
 
 # convert a few files to UTF-8
-iconv -f iso8859-1 -t utf-8 Changelog -o Changelog.conv && \
-touch -r Changelog Changelog.conv && \
-mv -f Changelog.conv Changelog
-
-iconv -f iso8859-1 -t utf-8 txt2regex-%{version}.sh -o txt2regex-%{version}.sh.conv && \
-touch -r txt2regex-%{version}.sh txt2regex-%{version}.sh.conv && \
-mv -f txt2regex-%{version}.sh.conv txt2regex-%{version}.sh
-
-iconv -f iso8859-1 -t utf-8 txt2regex.man -o txt2regex.man.conv && \
-touch -r txt2regex.man txt2regex.man.conv && \
-mv -f txt2regex.man.conv txt2regex.man
+for i in Changelog txt2regex-%{version}.sh txt2regex.man; do \
+  iconv -f iso8859-1 -t utf-8 $i -o $i.conv; \
+  touch -r $i $i.conv; \
+  mv -f $i.conv $i; \
+done
+
+%build
+# nothing to do
 
 %install
 rm -rf %{buildroot}
@@ -69,5 +70,10 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Wed Jun  9 2010 Richard Fearn <richardfearn at gmail.com> - 0.8-2
+- fix licence: upstream has confirmed that it should be GPLv2 only
+- improve description
+- use for loop to convert files to UTF-8
+
 * Sun Jun  6 2010 Richard Fearn <richardfearn at gmail.com> - 0.8-1
 - initial package for Fedora