commit 8cdd77d0b1f0e4b967e1e1142bfca5b5dc6c3823
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Thu Mar 12 10:51:53 2015 +0100
Remove script strip_FAQ.sh from sources; Rename script
perl-DBI.spec | 9 +++++----
strip_FAQ.sh => repackage.sh | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/perl-DBI.spec b/perl-DBI.spec
index fa5a779..dbe1dde 100644
--- a/perl-DBI.spec
+++ b/perl-DBI.spec
@@ -10,7 +10,7 @@
Name: perl-DBI
Version: 1.631
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A database access API for perl
Group: Development/Libraries
License: GPL+ or Artistic
@@ -18,11 +18,9 @@ URL: http://dbi.perl.org/
# The source tarball must be repackaged to remove the DBI/FAQ.pm, since the
# license is not a FSF free license.
# When upgrading, download the new source tarball, and run
-# "./strip-FAQ.sh <version>" to produce the "-repackaged" tarball.
+# "./repackage.sh <version>" to produce the "-repackaged" tarball.
# Source0: http://www.cpan.org/authors/id/T/TI/TIMB/DBI-%{version}.tar.gz
Source0: DBI-%{version}_repackaged.tar.gz
-Source1: strip_FAQ.sh
-
# Add a security warning about use of RPC::PlClient, bug #1030578, CPAN RT#90475
Patch0: DBI-1.630-Security-notice-for-Proxy.patch
BuildRequires: perl
@@ -166,6 +164,9 @@ make test
%endif
%changelog
+* Thu Mar 12 2015 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 1.631-7
+- Remove script strip_FAQ.sh from sources
+
* Mon Mar 09 2015 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 1.631-6
- Repackage source tarball to remove non-free DBI/FAQ.pm (bug #1199532)
diff --git a/strip_FAQ.sh b/repackage.sh
similarity index 52%
rename from strip_FAQ.sh
rename to repackage.sh
index 8d8f138..226b09c 100755
--- a/strip_FAQ.sh
+++ b/repackage.sh
@@ -1,4 +1,25 @@
#!/bin/bash
+#
+# Copyright (C) 2010 Red Hat, Inc.
+# Authors:
+# Thomas Woerner <twoerner@xxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Script was a bit changed for DBI, because command below breaks tar index
+# tar -f <tarball> --delete <file>
+# Jitka Plesnikova <jplesnik@xxxxxxxxxx>
version=$1
[ -z "$version" ] && { echo "Usage: $0 <version>"; exit 1; }
@@ -7,6 +28,8 @@ version=$1
declare -a REMOVE
REMOVE[${#REMOVE[*]}]="lib/DBI/FAQ.pm"
+# no changes below this line should be needed
+
orig="DBI-${version}"
orig_tgz="${orig}.tar.gz"
repackaged="${orig}_repackaged"
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
