rpms/perl-Log-Log4perl/FC-4 perl-Log-Log4perl.spec,1.3,1.4

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6164/FC-4

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
Sync with devel


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/perl-Log-Log4perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:16 -0000	1.3
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:38:19 -0000	1.4
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.