Release-1.5.4-20080101

1 files changed, 12 insertions, 45 deletions

diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index fa432c4..5db7240 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,6 +1,6 @@
 %define version 1.5.4
-%define revision 1
-%define mmn 1
+%define revision 20080101
+%define mmn 20080101
 %define name doxygen
 
 %define contentdir /var/www
@@ -20,7 +20,6 @@ BuildRoot: %{buildroot}
 BuildPrereq: libstdc++-devel >= 2.96, /usr/bin/perl, /usr/bin/latex, /usr/bin/dvips
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv, libstdc++ >= 2.96
 Provides: doxygen = %{mmn}
-#Obsoletes: doxygen-20050927
 
 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@@ -29,48 +28,17 @@ documentation is extracted directly from the sources. Doxygen can
 also be configured to extract the code structure from undocumented
 source files.
 
-%package doxywizard
-Group: Development/Libraries
-Summary: GUI Interface for doxygen.
-Requires: doxygen = %{mmn}
-Requires: qt >= 3.3
-Provides: doxywizard = %{mmn}
-# Obsoletes:
-
-%description doxywizard
-Doxygen can generate an online class browser (in HTML) and/or a
-reference manual (in LaTeX) from a set of documented source files. The
-documentation is extracted directly from the sources. Doxygen can
-also be configured to extract the code structure from undocumented
-source files.
-
-This is the GUI interface for doxygen.  It requires qt and X11 to
-install.
-
-%package manual
-Group: Documentation
-Summary: Documentation for doxygen.
-Provides: doxygenmanual = %{mmn}
-#Obsoletes: 
-
-%description manual
-This contains the manpages for doxygen.  The information can also be
-found at http://www.doxygen.org/.
-
 %prep
 %setup -q -n %{name}-%{version}_%{revision}
-./configure --with-doxywizard --prefix $RPM_BUILD_ROOT/usr
+./configure --prefix $RPM_BUILD_ROOT/usr
 
 %build
 make %{?_smp_mflags}
-make pdf %{?_smp_mflags}
+make %{?_smp_mflags} pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install
-mkdir -p $RPM_BUILD_ROOT/usr/share/doxygen
-cp -f ./latex/*.pdf $RPM_BUILD_ROOT/usr/share/doxygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,21 +46,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-%doc README LICENSE LANGUAGE.HOWTO examples
+%doc README LICENSE LANGUAGE.HOWTO examples ./latex/*.pdf
+%doc /usr/man/man1/doxygen.1.gz
+%doc /usr/man/man1/doxytag.1.gz
 
 %{_bindir}/doxygen
 %{_bindir}/doxytag
 
-%files doxywizard
-%defattr(-,root,root)
-%{_bindir}/doxywizard
+%changelog
+* Sun Nov 18 2007 Kevin McBride <kevin@planetsaphire.com> 1.5.4
+- consolidated manual package in lieu of --excludedocs flag for rpm --install
 
-%files manual
-%defattr(-,root,root)
-/usr/share/doxygen/*.pdf
-%doc /usr/man/man1/doxy*
+* Fri Oct 21 2005 Kevin McBride <kevin@planetsaphire.com> 1.4.5
+- made .spec file compatible with tmake
 
-%changelog
 * Mon Oct 10 2005 Kevin McBride <kevin@planetsaphire.com> 1.4.5
 - fixed versioning bugs.