From cac7ed15627a54f072f9640fd4ddae8b2ec21ce8 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Tue, 10 Feb 2009 23:37:27 +0000
Subject: removed not clearly licensed *.plx file (#483390 #c11)
---
.cvsignore | 2 +-
Makefile | 16 ++++++++++++++++
perl-Schedule-Cron-Events.spec | 15 +++++++++++----
sources | 2 +-
4 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/.cvsignore b/.cvsignore
index 3b87eb2..d094486 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Schedule-Cron-Events-1.8.tar.gz
+Schedule-Cron-Events-1.8-noplx.tar.gz
diff --git a/Makefile b/Makefile
index eb0d9b5..0f08e17 100644
--- a/Makefile
+++ b/Makefile
@@ -19,3 +19,19 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
+
+# can not use final tarball name here as it will conflict with rules
+# within Makefile.common
+TARBALL_CLEAN = Schedule-Cron-Events-${VERSION}-noplx.tar.gz.tmp
+TARBALL = Schedule-Cron-Events-${VERSION}.tar.gz
+
+clean-sources: ${TARBALL_CLEAN}
+
+${TARBALL_CLEAN}: ${TARBALL}
+ rm -rf $@.tmp Schedule-Cron-Events-${VERSION}
+ tar xfz ${TARBALL}
+ rm -f Schedule-Cron-Events-${VERSION}/cron_event_predict.plx
+ sed -e '/cron_event_predict.plx/d' -i Schedule-Cron-Events-${VERSION}/MANIFEST
+ sed -e '19,21d' -i Schedule-Cron-Events-${VERSION}/Makefile.PL
+ tar cfz Schedule-Cron-Events-${VERSION}-noplx.tar.gz.tmp
Schedule-Cron-Events-${VERSION}
+ rm -rf Schedule-Cron-Events-${VERSION}
diff --git a/perl-Schedule-Cron-Events.spec b/perl-Schedule-Cron-Events.spec
index b6b3f76..4a1d660 100644
--- a/perl-Schedule-Cron-Events.spec
+++ b/perl-Schedule-Cron-Events.spec
@@ -1,11 +1,17 @@
Name: perl-Schedule-Cron-Events
Version: 1.8
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Take a line from a crontab and find out when events will occur
License: GPL+ or Artistic
Group: Development/Libraries
URL:
http://search.cpan.org/dist/Schedule-Cron-Events/
-Source0:
http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{ver...
+#
http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{ver...
+# is the original upstream source. Unfortunately Schedule-Cron-Events includes the file
+# cron_event_predict.plx - being not covered by any of the license statements inside of
+# the upstream tarball. And per Fedora Legal, we have to remove this file once upstream
+# has clarified the licensing of this file. Cleaning sources can be simply done using:
+# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
+Source0: Schedule-Cron-Events-%{version}-noplx.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Set::Crontab)
@@ -45,12 +51,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README
-%{_bindir}/cron_event_predict.plx
%{perl_vendorlib}/*
-%{_mandir}/man1/*
%{_mandir}/man3/*
%changelog
+* Wed Feb 11 2009 Robert Scheck <robert(a)fedoraproject.org> 1.8-16
+- removed not clearly licensed *.plx file (#483390 #c11)
+
* Thu Sep 11 2008 Miroslav Suchý <msuchy(a)redhat.com> 1.8-15
- add build requires ExtUtils::MakeMaker
diff --git a/sources b/sources
index 0ba598a..33b9757 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9cc7e3ce3e00935cdba315404be91bf Schedule-Cron-Events-1.8.tar.gz
+14a5609f3ca52fa38c6b3202203429f5 Schedule-Cron-Events-1.8-noplx.tar.gz
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-Schedule-Cron-Events.git/commit/?...