[perl-DBI/f22] Remove script strip_FAQ.sh from sources; Rename script

Jitka Plesnikova jplesnik at fedoraproject.org
Thu Mar 12 09:19:02 UTC 2015


commit f4a7fe82942675641fb27fc6acf8b7a757ee668d
Author: Jitka Plesnikova <jplesnik at redhat.com>
Date:   Thu Mar 12 10:18:29 2015 +0100

    Remove script strip_FAQ.sh from sources; Rename script

 perl-DBI.spec                |  8 +++++---
 strip_FAQ.sh => repackage.sh | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/perl-DBI.spec b/perl-DBI.spec
index 7a448cb..4d30dac 100644
--- a/perl-DBI.spec
+++ b/perl-DBI.spec
@@ -10,7 +10,7 @@
 
 Name:           perl-DBI
 Version:        1.633
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A database access API for perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -18,10 +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
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Find)
@@ -171,6 +170,9 @@ make test
 %endif
 
 %changelog
+* Thu Mar 12 2015 Jitka Plesnikova <jplesnik at redhat.com> - 1.633-3
+- Remove script strip_FAQ.sh from sources
+
 * Mon Mar 09 2015 Jitka Plesnikova <jplesnik at redhat.com> - 1.633-2
 - 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 at redhat.com>
+#
+# 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 at redhat.com>
 
 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"


More information about the scm-commits mailing list