rpms/epylog/devel epylog.spec,1.3,1.4

Konstantin Ryabitsev (icon) fedora-extras-commits at redhat.com
Mon Apr 25 18:27:47 UTC 2005


Author: icon

Update of /cvs/extras/rpms/epylog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17641

Modified Files:
	epylog.spec 
Log Message:
Committing changes suggested by Michael Schwendt.



Index: epylog.spec
===================================================================
RCS file: /cvs/extras/rpms/epylog/devel/epylog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epylog.spec	5 Apr 2005 21:17:27 -0000	1.3
+++ epylog.spec	25 Apr 2005 18:27:45 -0000	1.4
@@ -1,10 +1,9 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?_perl_vendorlib: %define _perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
 
 Name:           epylog
 Version:        1.0.3
-Release:        2
+Release:        3
 Epoch:          0
 Summary:        New logs analyzer and parser
 
@@ -33,7 +32,7 @@
 %package perl
 Summary:        Perl module for writing external Epylog modules
 Group:          Development/Libraries
-Requires:       epylog
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
@@ -54,7 +53,7 @@
     --with-python=%{__python} \
     --with-python-dirs=%{_python_sitelib} \
     --with-lynx=%{_bindir}/links \
-    --with-site-perl=%{_perl_vendorlib}
+    --with-site-perl=%{perl_vendorlib}
 ##
 # Fix version.
 #
@@ -73,11 +72,7 @@
 ##
 # Remove installed docs
 #
-rm -rf %{buildroot}%{_defaultdocdir}
-##
-# Move docs to doc
-#
-mv AUTHORS ChangeLog INSTALL LICENSE README doc/
+rm -rf %{buildroot}%{_docdir}
 
 
 %clean
@@ -86,14 +81,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/*
+%doc AUTHORS ChangeLog INSTALL LICENSE README doc/*
 %config(noreplace) %{_sysconfdir}/epylog
 %config(missingok) %{_sysconfdir}/cron.*/*
 %dir %{_localstatedir}/lib/epylog
 %dir %{_datadir}/epylog
+%dir %{_datadir}/epylog/modules
 %{_datadir}/epylog/modules/*
 %{_python_sitelib}/epylog
-%{_sbindir}/epylog
+%{_sbindir}/*
 %{_mandir}/man8/*
 %{_mandir}/man5/*
 
@@ -101,12 +97,20 @@
 
 %files perl
 %defattr(-,root,root,-)
-%{_perl_vendorlib}/epylog.pm
+%{perl_vendorlib}/epylog.pm
 %{_mandir}/man3/*
 
 
 
 %changelog
+* Mon Apr 25 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 1.0.3-3
+- Do not redefine perl_vendorlib, since it's available in the default
+  rpmmacros.
+- Make epylog-perl depend on full EVR.
+- Use _docdir instead of _defaultdocdir.
+- Add modules dir to filelists.
+- Don't move docs around.
+
 * Tue Apr 05 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 1.0.3-2
 - Do not BuildRequire sed.
 




More information about the fedora-extras-commits mailing list