rpms/dia/devel dia-0.94-help.patch,1.1,1.2 dia.spec,1.2,1.3

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9100

Modified Files:
	dia-0.94-help.patch dia.spec 
Log Message:
rh#170834# fix dia manpage

dia-0.94-help.patch:

Index: dia-0.94-help.patch
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia-0.94-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dia-0.94-help.patch	17 Oct 2005 10:54:39 -0000	1.1
+++ dia-0.94-help.patch	20 Oct 2005 15:33:51 -0000	1.2
@@ -80,3 +80,14 @@
    [
  
      <!ENTITY VERSION "0.94">
+--- dia-0.94.orig/configure.in	2005-10-20 15:40:19.000000000 +0100
++++ dia-0.94/configure.in	2005-10-20 15:40:33.000000000 +0100
+@@ -389,7 +389,7 @@
+ db2man_file=
+ for file in \
+   /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \
+-  /usr/share/sgml/docbook/xsl-stylesheets-\*/manpages/docbook.xsl; do
++  /usr/share/sgml/docbook/xsl-stylesheets-*/manpages/docbook.xsl; do
+   if test -f $file; then db2man_file=$file; break; fi
+ done
+ AM_CONDITIONAL(HAVE_DB2MAN, test "x$db2man_file" != x)


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dia.spec	17 Oct 2005 11:16:57 -0000	1.2
+++ dia.spec	20 Oct 2005 15:33:51 -0000	1.3
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	15
+Release:	16
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -52,17 +52,13 @@
 %patch5 -p1 -b .rh165337
 
 %build
+rm doc/*/dia.1
 aclocal-1.7
 libtoolize --force
 automake-1.7
-DB2HTML="/usr/bin/db2html -V '%%use-id-as-filename%%'" 
-export DB2HTML
 autoconf
 %configure --enable-gnome --enable-db2html --with-cairo=no
 
-## XXXX PGB - work around compiler bug
-#perl -pi -e "s|-O2||g" plug-ins/hpgl/Makefile
-
 CFLAGS=$RPM_OPT_FLAGS make
  
 %install
@@ -116,6 +112,8 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Oct 20 2005 Caolan McNamara <caolanm at redhat.com> 1:0.94-16
+
 * Mon Oct 17 2005 Caolan McNamara <caolanm at redhat.com>
 - move to extras