rpms/doxygen/F-12 doxygen.spec,1.71,1.72
Than Ngo
than at fedoraproject.org
Fri Dec 18 13:24:36 UTC 2009
Author: than
Update of /cvs/extras/rpms/doxygen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22527
Modified Files:
doxygen.spec
Log Message:
- bz#225709, merged review
Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-12/doxygen.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- doxygen.spec 11 Dec 2009 14:29:33 -0000 1.71
+++ doxygen.spec 18 Dec 2009 13:24:35 -0000 1.72
@@ -1,12 +1,9 @@
%define _default_patch_fuzz 2
-%define qt_version 4.4
-%{!?with_qt:%define with_qt 1}
-
Summary: A documentation system for C/C++
Name: doxygen
Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
Url: http://www.stack.nl/~dimitri/doxygen/index.html
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -34,17 +31,15 @@ documentation is extracted directly from
also be configured to extract the code structure from undocumented
source files.
-%if %{with_qt}
%package doxywizard
-Summary: A GUI for creating and editing configuration files.
+Summary: A GUI for creating and editing configuration files
Group: User Interface/X
Requires: %{name} = %{epoch}:%{version}
-BuildRequires: qt-devel => %{qt_version}
+BuildRequires: qt-devel => 4.4
%description doxywizard
Doxywizard is a GUI for creating and editing configuration files that
are used by doxygen.
-%endif
%prep
%setup -q
@@ -58,9 +53,7 @@ unset QTDIR
./configure \
--prefix %{_prefix} \
--shared \
-%if %{with_qt}
--with-doxywizard \
-%endif
--release
# workaround for "Error: operand out of range", language.cpp needs to be splitted
@@ -77,17 +70,16 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-%if !%{with_qt}
- rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
-%endif
-
# convert into utf-8
iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
-touch -r LANGUAGE.HOWTO.new && mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
+touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new
+mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
# drop -x bit
find examples -type f | xargs chmod -x
+sed -i -e "s|#!perl|#! /usr/bin/perl|" examples/tag/html/installdox
+
%clean
rm -rf %{buildroot}
@@ -100,14 +92,15 @@ rm -rf %{buildroot}
%{_mandir}/man1/doxygen.1*
%{_mandir}/man1/doxytag.1*
-%if %{with_qt}
%files doxywizard
%defattr(-,root,root)
%{_bindir}/doxywizard
%{_mandir}/man1/doxywizard*
-%endif
%changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-3
+- bz#225709, merged review
+
* Fri Dec 11 2009 Than Ngo <than at redhat.com> - 1:1.6.1-2
- bz#225709, merged review
More information about the scm-commits
mailing list