[log4c/epel7] Port to EPEL 7, disable documentation due to missing doxygen-latex.

František Dvořák valtri at fedoraproject.org
Tue May 6 11:37:10 UTC 2014


commit 74a06311124c7857a23d77c1d35aa250b39e35a4
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Tue May 6 13:39:02 2014 +0200

    Port to EPEL 7, disable documentation due to missing doxygen-latex.

 log4c.spec |   39 ++++++++-------------------------------
 1 files changed, 8 insertions(+), 31 deletions(-)
---
diff --git a/log4c.spec b/log4c.spec
index 5b1f0db..e8b91b2 100644
--- a/log4c.spec
+++ b/log4c.spec
@@ -1,5 +1,3 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
 Name:		log4c
 Version:	1.2.4
 Release:	1%{?dist}
@@ -9,9 +7,7 @@ License:	LGPLv2+
 URL:		http://log4c.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-BuildRequires:	doxygen-latex
 BuildRequires:	expat-devel
-BuildRequires:	graphviz
 
 %description
 Log4c is a C language library for flexible logging to files, syslog and other
@@ -33,32 +29,19 @@ This package contains development files for %{name}. If you like to develop
 programs using %{name}, you will need to install %{name}-devel.
 
 
-%package doc
-Summary:	Documentation for %{name}
-Group:		Documentation
-BuildArch:	noarch
-
-%description doc
-Log4c is a C language library for flexible logging to files, syslog and other
-destinations. It is modeled after the Log for Java library (log4j),
-staying as close to their API as is reasonable.
-
-This package contains %{name} documentation.
-
-
 %prep
 %setup -q
 
 
 %build
-%configure --enable-doc --disable-static
+%configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
-make install docdir=%{_pkgdocdir} DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 # example config file below shouldn't live in /etc/
-mv %{buildroot}/etc/log4crc.sample %{buildroot}%{_pkgdocdir}
+rm %{buildroot}/etc/log4crc.sample
 rm %{buildroot}%{_libdir}/*.la
 # munge log4c-config to prevent file conflicts on multilib systems,
 # the default paths are not needed in the build flags anyway
@@ -75,12 +58,7 @@ sed -r -i \
 
 
 %files
-%{_pkgdocdir}/COPYING
-%{_pkgdocdir}/AUTHORS
-%{_pkgdocdir}/ChangeLog
-%{_pkgdocdir}/NEWS
-%{_pkgdocdir}/README
-%{_pkgdocdir}/log4crc.sample
+%doc COPYING AUTHORS ChangeLog NEWS README log4crc.sample
 %{_libdir}/liblog4c.so.3
 %{_libdir}/liblog4c.so.3.*
 
@@ -91,14 +69,13 @@ sed -r -i \
 %{_includedir}/*
 %{_datadir}/aclocal/log4c.m4
 %{_mandir}/man1/*
-%{_mandir}/man3/*
-
-%files doc
-%{_pkgdocdir}/html
-%{_pkgdocdir}/log4c.pdf
 
 
 %changelog
+* Tue May 06 2014 František Dvořák <valtri at civ.zcu.cz> - 1.2.4-1
+- Port to EPEL 7 branch
+- Disable -doc subpackage again
+
 * Thu Oct 03 2013 František Dvořák <valtri at civ.zcu.cz> - 1.2.4-1
 - Release log4c 1.2.4
 - Add -doc subpackage


More information about the scm-commits mailing list