rpms/pdfedit/FC-6 pdfedit-doxygen.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 pdfedit.spec, 1.2, 1.3

[Bernard Johnson (bjohnson)]

Author: bjohnson

Update of /cvs/extras/rpms/pdfedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22095/FC-6

Modified Files:
	.cvsignore pdfedit.spec 
Added Files:
	pdfedit-doxygen.patch 
Log Message:
don't give doxygen /dev/null as a parameter, make it use a non-existant file
instead


pdfedit-doxygen.patch:

--- NEW FILE pdfedit-doxygen.patch ---
If someone attempts to build pdfedit as root, running doxygen against /dev/null
will destroy /dev/null because doxygen renames /dev/null.
--- pdfedit-0.3.0/doc/Makefile.orig	2006-09-18 08:03:26.000000000 -0600
+++ pdfedit-0.3.0/doc/Makefile	2007-04-17 13:58:34.000000000 -0600
@@ -4,7 +4,7 @@
 
 #Build all documentation, including doxygen programmer documentation and doxygen's default stylesheet
 all:	doc_core
-	doxygen -w html /dev/null /dev/null programmer/html/doxygen.css || true
+	doxygen -w html /tmp/pdfedit.$(PPID) /tmp/pdfedit.$(PPID) programmer/html/doxygen.css || true
 	doxygen || true
 
 #Core documentation, without PDF


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pdfedit/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Apr 2007 03:43:20 -0000	1.3
+++ .cvsignore	17 Apr 2007 20:31:23 -0000	1.4
@@ -1,2 +1 @@
-pdfedit-0.2.5.tar.bz2
 pdfedit-0.3.0.tar.bz2


Index: pdfedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pdfedit/FC-6/pdfedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdfedit.spec	15 Apr 2007 03:43:20 -0000	1.2
+++ pdfedit.spec	17 Apr 2007 20:31:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pdfedit
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A complete pdf document editing solution
 
 Group:          Applications/Publishing
@@ -9,6 +9,7 @@
 Source0:        http://downloads.sourceforge.net/pdfedit/%{name}-%{version}.tar.bz2
 Source1:        pdfedit.desktop
 Patch0:         pdfedit-destdir.patch
+Patch1:         pdfedit-doxygen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel, lesstif-devel, libpaper-devel
@@ -26,6 +27,7 @@
 %setup -q
 
 %patch0 -p1 -b .destdir
+%patch1 -p1 -b .doxygen
 
 %build
 %configure
@@ -98,6 +100,9 @@
 %doc doc/user/gui/menuAndToolbarsFun/images doc/user/examples
 
 %changelog
+* Tue Apr 17 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.0-2
+- don't allow doxygen to use /dev/null
+
 * Sat Apr 14 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.0-1
 - v 0.3.0-1