rpms/doxygen/devel doxygen-1.5.8-qt4.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 doxygen.spec, 1.57, 1.58 sources, 1.28, 1.29 doxygen-1.2.18-libdir.patch, 1.3, NONE doxygen-1.2.18-libdir64.patch, 1.1, NONE doxygen-1.5.6-config.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19975

Modified Files:
	.cvsignore doxygen.spec sources 
Added Files:
	doxygen-1.5.8-qt4.patch 
Removed Files:
	doxygen-1.2.18-libdir.patch doxygen-1.2.18-libdir64.patch 
	doxygen-1.5.6-config.patch 
Log Message:
1.5.8


doxygen-1.5.8-qt4.patch:

--- NEW FILE doxygen-1.5.8-qt4.patch ---
diff -up doxygen-1.5.8/configure.qt4 doxygen-1.5.8/configure
--- doxygen-1.5.8/configure.qt4	2008-12-26 20:22:39.000000000 +0100
+++ doxygen-1.5.8/configure	2009-02-06 11:00:44.000000000 +0100
@@ -268,7 +268,7 @@ if test "$f_wizard" = YES; then
   if test -z "$QTDIR"; then
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+    for d in /usr/{lib,lib64,share,qt}/{qt-4,qt4,qt,qt*,4}; do
       if test -x "$d/bin/qmake"; then
         QTDIR=$d
       fi
@@ -485,6 +485,7 @@ INSTTOOL  = $f_insttool
 DOXYDOCS  = ..
 DOCDIR    = $f_docdir
 QTDIR     = $QTDIR
+MAN1DIR    = share/man/man1
 EOF
 
 if test "$f_dot" != NO; then
diff -up doxygen-1.5.8/addon/doxywizard/Makefile.in.orig doxygen-1.5.8/addon/doxywizard/Makefile.in
--- doxygen-1.5.8/addon/doxywizard/Makefile.in.orig	2009-02-06 14:55:30.000000000 +0100
+++ doxygen-1.5.8/addon/doxywizard/Makefile.in	2009-02-06 14:56:08.000000000 +0100
@@ -29,11 +29,11 @@ distclean: Makefile.doxywizard
 	$(RM) Makefile.doxywizard
 
 install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
 	cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-	$(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
+	$(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
 	rm doxywizard.1
 
 FORCE:
diff -up doxygen-1.5.8/Makefile.in.orig doxygen-1.5.8/Makefile.in
--- doxygen-1.5.8/Makefile.in.orig	2009-02-06 15:00:41.000000000 +0100
+++ doxygen-1.5.8/Makefile.in	2009-02-06 15:00:54.000000000 +0100
@@ -44,8 +44,6 @@ distclean: clean
 
 DATE=$(shell date "+%B %Y")
 
-MAN1DIR = man/man1
-
 install: doxywizard_install 
 	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
 	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Oct 2008 10:23:33 -0000	1.27
+++ .cvsignore	6 Feb 2009 14:12:01 -0000	1.28
@@ -14,3 +14,4 @@
 doxygen-1.5.5.src.tar.gz
 doxygen-1.5.6.src.tar.gz
 doxygen-1.5.7.1.src.tar.gz
+doxygen-1.5.8.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- doxygen.spec	6 Oct 2008 12:17:33 -0000	1.57
+++ doxygen.spec	6 Feb 2009 14:12:01 -0000	1.58
@@ -1,20 +1,16 @@
 %define _default_patch_fuzz 2
 
-%define qt_version 3.3.8
+%define qt_version 4.4
 %{!?with_qt:%define with_qt 1}
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.7.1
+Version: 1.5.8
 Release: 1%{?dist}
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-
-Patch0: doxygen-1.5.6-config.patch
-Patch2: doxygen-1.2.18-libdir.patch
-Patch3: doxygen-1.2.18-libdir64.patch
-Patch4: doxygen-1.5.5-system-png.patch
-
+Patch1: doxygen-1.5.5-system-png.patch
+Patch2: doxygen-1.5.8-qt4.patch
 Group: Development/Tools
 # No version is specified.
 License: GPL+
@@ -43,7 +39,7 @@
 Summary: A GUI for creating and editing configuration files.
 Group: User Interface/X
 Requires: %{name} = %{epoch}:%{version}
-BuildRequires: qt3-devel => %{qt_version}
+BuildRequires: qt-devel => %{qt_version}
 
 %description doxywizard
 Doxywizard is a GUI for creating and editing configuration files that
@@ -52,28 +48,18 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
-
-%if "%{_lib}" != "lib"
-%patch3 -p1 -b .libdir
-%else
-%patch2 -p1 -b .libdir
-%endif
-%patch4 -p1 -b .system-png
+%patch1 -p1 -b .system-png
+%patch2 -p1 -b .qt4
 
 %build
-%if %{with_qt}
-QTDIR="" && . /etc/profile.d/qt.sh
-%endif
-
+unset QTDIR
 ./configure \
    --prefix %{_prefix} \
    --shared \
-   --release \
 %if %{with_qt}
    --with-doxywizard \
 %endif
-   --install %{_bindir}/install
+   --release
 
 make %{?_smp_mflags} all
 make docs
@@ -81,7 +67,7 @@
 %install
 rm -rf %{buildroot}
 
-make install INSTALL=%{buildroot}%{_prefix}
+make install DESTDIR=%{buildroot}
 
 %if !%{with_qt}
   rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
@@ -107,6 +93,9 @@
 %endif
 
 %changelog
+* Thu Feb 05 2009 Than Ngo <than at redhat.com> 1.5.8-1
+- 1.5.8
+
 * Mon Oct 06 2008 Than Ngo <than at redhat.com> 1.5.7.1-1
 - 1.5.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	6 Oct 2008 10:23:33 -0000	1.28
+++ sources	6 Feb 2009 14:12:01 -0000	1.29
@@ -1 +1 @@
-bc35dfd52bdae0247b862e67e0cbe7d7  doxygen-1.5.7.1.src.tar.gz
+7438b7ff875d522f02860eea39261953  doxygen-1.5.8.src.tar.gz


--- doxygen-1.2.18-libdir.patch DELETED ---


--- doxygen-1.2.18-libdir64.patch DELETED ---


--- doxygen-1.5.6-config.patch DELETED ---