rpms/txt2regex/F-13 licence-confirmation.eml, NONE, 1.1 txt2regex-no-TEXTDOMAINDIR.patch, NONE, 1.1 txt2regex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
richardfearn
richardfearn at fedoraproject.org
Mon Jul 19 17:42:25 UTC 2010
Author: richardfearn
Update of /cvs/pkgs/rpms/txt2regex/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9538
Modified Files:
.cvsignore sources
Added Files:
licence-confirmation.eml txt2regex-no-TEXTDOMAINDIR.patch
txt2regex.spec
Log Message:
import 0.8-3
--- NEW FILE licence-confirmation.eml ---
Delivered-To: richardfearn at gmail.com
Received: by 10.213.112.134 with SMTP id w6cs39014ebp;
Tue, 8 Jun 2010 13:45:44 -0700 (PDT)
Return-Path: <aureliojargas at gmail.com>
Received-SPF: pass (google.com: domain of aureliojargas at gmail.com designates 10.224.68.1 as permitted sender) client-ip=10.224.68.1;
Authentication-Results: mr.google.com; spf=pass (google.com: domain of aureliojargas at gmail.com designates 10.224.68.1 as permitted sender) smtp.mail=aureliojargas at gmail.com; dkim=pass header.i=aureliojargas at gmail.com
Received: from mr.google.com ([10.224.68.1])
by 10.224.68.1 with SMTP id t1mr1291172qai.14.1276029458811 (num_hops = 1);
Tue, 08 Jun 2010 13:37:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=gamma;
h=domainkey-signature:received:mime-version:sender:received
:in-reply-to:references:from:date:x-google-sender-auth:message-id
:subject:to:content-type:content-transfer-encoding;
bh=le2nir/zm6qAd/KFadfw4wOyyZl+SVYB5pXOVbh0NPA=;
b=kO7KrJ971vPRaaCtGJyorK3Q9woijfeQEOq45NVUNrAhgZKR2VN8WlZTNw1BdNqjBt
G0i2bo1B13lVzWprSfig6bwPZJxhaCyNnrWrj2JeoiVT3QLNfXHih4v2qpWX/5iaBB1d
mNcEnjRSwMK+IhxJS4QKoQJzoiqMvGLTgQrjA=
DomainKey-Signature: a=rsa-sha1; c=nofws;
d=gmail.com; s=gamma;
h=mime-version:sender:in-reply-to:references:from:date
:x-google-sender-auth:message-id:subject:to:content-type
:content-transfer-encoding;
b=mVIIVSuUtXtwd96VF6gA7Ky9xOu8UZMByFYTs++E5+0S3raqeUgqS1lHMQazTd7UPb
phdr05JJL2PjUOjqTgrOQFVvbHlIzdAtyyYgCmKdjYx0Yp3B8CpCBIJyUYUlc3Tcvfti
W8Uu+upqeddEAa1WPX74pREGxml3DcSFSpenM=
Received: by 10.224.68.1 with SMTP id t1mr1291172qai.14.1276029454120; Tue, 08
Jun 2010 13:37:34 -0700 (PDT)
MIME-Version: 1.0
Sender: aureliojargas at gmail.com
Received: by 10.229.214.209 with HTTP; Tue, 8 Jun 2010 13:37:12 -0700 (PDT)
In-Reply-To: <AANLkTimdZu7VFi1ThrxdWJedyow4-rm2gHHrHfnOeNAv at mail.gmail.com>
References: <AANLkTimdZu7VFi1ThrxdWJedyow4-rm2gHHrHfnOeNAv at mail.gmail.com>
From: =?ISO-8859-1?Q?Aur=E9lio_Jargas?= <verde at aurelio.net>
Date: Tue, 8 Jun 2010 17:37:12 -0300
X-Google-Sender-Auth: axANBNwwO2703NOVtIlCOocdbmU
Message-ID: <AANLkTime35rfKeDIo3PF2_mcB7LYpdy9bBYulrSOpQkw at mail.gmail.com>
Subject: Re: txt2regex package for Fedora
To: Richard Fearn <richardfearn at gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Hello Richard,
Thanks for the contact. It's GPL v2 only.
Bye
On Tue, Jun 8, 2010 at 15:09, Richard Fearn <richardfearn at gmail.com> wrote:
> Hi Aurelio,
>
> I'm currently packaging txt2regex for Fedora. You can find the package
> review request here:
>
> https://bugzilla.redhat.com/show_bug.cgi?id=3D600914
>
> The COPYRIGHT file is a copy of the GPLv2. However the README file and
> txt2regex-0.8.sh itself both say just "GPL". It's not clear what
> licence you want to use for txt2regex - GPLv2 only, or GPLv2+.
>
> Could you clarify whether txt2regex is GPLv2 only or GPLv2+?
>
> It would definitely be a good idea to do a new (minor) release
> sometime to clear this up. (In the meantime I should be able to patch
> the README and txt2regex script to show the exact licence used.)
>
> Thanks!
>
> Regards,
>
> Richard
>
--=20
Aur=E9lio | www.aurelio.net | @oreio
txt2regex-no-TEXTDOMAINDIR.patch:
txt2regex-0.8.sh | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE txt2regex-no-TEXTDOMAINDIR.patch ---
diff -urN txt2regex-0.8/txt2regex-0.8.sh txt2regex-0.8-fedora/txt2regex-0.8.sh
--- txt2regex-0.8/txt2regex-0.8.sh 2004-09-28 20:51:01.000000000 +0100
+++ txt2regex-0.8-fedora/txt2regex-0.8.sh 2010-06-06 17:48:38.000000000 +0100
@@ -85,7 +85,6 @@
# TODO LATER user defined ranges on lists (prompt, validation)
TEXTDOMAIN=txt2regex
-TEXTDOMAINDIR=po
VERSION=0
# we _need_ bash>=2.04
--- NEW FILE txt2regex.spec ---
Name: txt2regex
Version: 0.8
Release: 3%{?dist}
Summary: Regular expression wizard that converts human sentences to regexes
Group: Applications/Text
License: GPLv2
URL: http://www.aurelio.net/soft/txt2regex/
Source0: http://txt2regex.sourceforge.net/txt2regex-%{version}.tgz
Source1: licence-confirmation.eml
# This removes the "TEXTDOMAINDIR=..." line from txt2regex. It isn't needed in
# Fedora where the default value is OK.
Patch0: txt2regex-no-TEXTDOMAINDIR.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
Requires: bash >= 2.04
%description
txt2regex is a regular expression wizard that converts human sentences to
regexes.
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
# 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
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}
# install txt2regex and locale files
make DESTDIR=%{buildroot} install
# install man page
mkdir -p %{buildroot}/%{_mandir}/man1
install -p -m 644 txt2regex.man %{buildroot}%{_mandir}/man1/txt2regex.1
# copy licence confirmation email into unpacked source tree, alongside other
# doc files
install -p -m 644 %{SOURCE1} .
# find locale files
%find_lang %{name}
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc Changelog COPYRIGHT NEWS README TODO licence-confirmation.eml
%{_bindir}/*
%{_mandir}/*/*
%changelog
* Sun Jul 18 2010 Richard Fearn <richardfearn at gmail.com> - 0.8-3
- include email confirming licence is GPLv2 only, as required by
https://fedoraproject.org/wiki/Packaging:LicensingGuidelines
* 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/txt2regex/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 19 Jul 2010 04:48:59 -0000 1.1
+++ .cvsignore 19 Jul 2010 17:42:24 -0000 1.2
@@ -0,0 +1 @@
+txt2regex-0.8.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/txt2regex/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 19 Jul 2010 04:49:00 -0000 1.1
+++ sources 19 Jul 2010 17:42:24 -0000 1.2
@@ -0,0 +1 @@
+83bc1f95b36fe51ade8d130fab390103 txt2regex-0.8.tgz
More information about the scm-commits
mailing list