- added system-libpng patch to link with system zlib and libpng

- release 2

Changed files:
    doxygen-system-libpng.patch -> 1.1
    doxygen.spec -> 1.36

diff --git a/doxygen-system-libpng.patch b/doxygen-system-libpng.patch
new file mode 100644 (file)
index 0000000..4e8306c
--- /dev/null
+++ b/doxygen-system-libpng.patch
@@ -0,0 +1,28 @@
+--- doxygen-1.2.18/configure.orig      Wed Aug 21 19:48:09 2002
++++ doxygen-1.2.18/configure   Wed Jan 29 21:14:26 2003
+@@ -434,7 +434,7 @@
+ EOF
+ fi
+ 
+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in"
++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in"
+ 
+ for i in $f_inmakefiles ; do
+      SRC=$i
+@@ -451,7 +451,6 @@
+        echo "" >> $DST
+        echo "all: src/version.cpp " >> $DST
+        echo " \$(MAKE) -C qtools" >> $DST
+-       echo " \$(MAKE) -C libpng" >> $DST
+        echo " \$(MAKE) -C src" >> $DST
+        if test $f_wizard = YES; then
+          echo "       \$(MAKE) -C addon/doxywizard" >> $DST
+@@ -467,7 +466,7 @@
+      echo "  Created $DST from $SRC..."
+ done
+ 
+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in src/doxysearch.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in" 
++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in src/doxysearch.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in" 
+ 
+ for i in $f_inprofiles ; do
+      SRC=$i

diff --git a/doxygen.spec b/doxygen.spec
index 796fa47b950dd3f5867430686ae68fd58a126c3b..2d6dd69403ae3a358b558424520e84ae43da1015 100644 (file)
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -5,19 +5,20 @@ Summary(ru):  
 Summary(uk):   óÉÓÔÅÍÁ ÄÏËÕÍÅÎÔÕ×ÁÎÎÑ ÄÌÑ C ÔÁ C++
 Name:          doxygen
 Version:       1.2.18
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Development/Tools
 Source0:       ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
+Patch0:                %{name}-system-libpng.patch
 URL:           http://www.stack.nl/~dimitri/doxygen/
-#BuildRequires:        qt-devel => 3.0.5
+BuildRequires: ghostscript
+BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: tetex
 BuildRequires: tetex-dvips
 BuildRequires: tetex-latex
 BuildRequires: tetex-pdftex
-BuildRequires: ghostscript
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -95,6 +96,9 @@ Wizard gr
 
 %prep
 %setup -q
+%patch -p1
+
+rm -rf libpng
 
 %build
 export QTDIR=%{_prefix}