OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dia?expand=0&rev=6

dia.spec

@@ -20,10 +20,10 @@ Requires:       ghostscript-fonts-std python-gtk python-numeric
 # Warning: Missing "Requires: glibc-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libm.so).
 # Warning: Missing "Requires: zlib-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libz.so).
 # Requires:       glibc-devel libpng-devel zlib-devel
-Autoreqprov:    on
+AutoReqProv:    on
 Summary:        A Diagram Creation Program
 Version:        0.96.1
-Release:        1
+Release:        41
 Source:         ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Source1:        font-test-japanese.dia
 Source2:        font-test-czech.dia
@@ -34,7 +34,11 @@ Patch5:         dia_bugfixes.diff
 Patch8:         dia-group-props-size.patch
 Patch13:        dia-64bit-clean.patch
 Patch14:        dia-python-acinclude.patch
-URL:            http://live.gnome.org/Dia
+# PATCH-FIX-OPENSUSE dia-help.patch bnc157798
+Patch15:        dia-help.patch
+# PATCH-FIX-UPSTREAM dia-0.96-pre3-docs.patch bgo404535
+Patch16:        dia-0.96-pre3-docs.patch
+Url:            http://live.gnome.org/Dia
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %suse_version > 1020
 Requires:       %{name}-lang = %{version}
@@ -69,6 +73,8 @@ Authors:
 %patch8
 %patch13
 %patch14
+%patch15 -p1
+%patch16 -p1
 # Work around gettext bug #186174
 LANG=en_US.UTF-8 msgconv po/ko.po -o po/ko.po.new
 mv po/ko.po.new po/ko.po
@@ -82,17 +88,15 @@ autoreconf -f -i
 	--with-python\
 	--with-cairo\
 	--with-gnomeprint
-make docdir=%{_docdir}/%{name} %{?jobs:-j%jobs}
+make  %{?jobs:-j%jobs}
 
 %install
-%makeinstall docdir=%{_docdir}/%{name}
+%makeinstall
 %suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart GNOME
 %find_lang %{name}
-cp -a AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia $RPM_BUILD_ROOT%{_docdir}/%{name}/
 # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml
 rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 %if %suse_version > 1020
-
 %fdupes -s $RPM_BUILD_ROOT
 %endif
 
@@ -101,17 +105,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
 %{_bindir}/*
 %{_libdir}/dia
 %{_datadir}/applications/*.desktop
 %{_datadir}/dia
 %{_datadir}/pixmaps/*
 %doc %{_mandir}/man1/*.*
+%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia
 
 %files lang -f %{name}.lang
-
+%defattr(-,root,root)
+%{_datadir}/gnome/help/dia/*
 %changelog
+* Wed Oct 31 2007 - btimothy@suse.de
+- Force xmldocs.make and doc/Makefile.am to use GNOME
+  configuration for help files (BNC #157798).
+- Fix en language help file XML parsing (BGO #404535).
 * Thu Aug 16 2007 - jpr@suse.de
 - Update to 0.96.1
   * Empty initial lines in shapes crashes Dia (BGO #421250).