Mailinglist Archive: opensuse-commit (858 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package dia
checked in at Fri Nov 2 01:09:35 CET 2007.

--------
--- GNOME/dia/dia.changes       2007-08-17 14:42:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/dia/dia.changes        2007-10-31 
23:41:51.051520000 +0100
@@ -1,0 +2,7 @@
+Wed Oct 31 16:30:00 MDT 2007 - btimothy@xxxxxxx
+
+- 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).
+
+-------------------------------------------------------------------

New:
----
  dia-0.96-pre3-docs.patch
  dia-help.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dia.spec ++++++
--- /var/tmp/diff_new_pack.IU3815/_old  2007-11-02 01:08:06.000000000 +0100
+++ /var/tmp/diff_new_pack.IU3815/_new  2007-11-02 01:08:06.000000000 +0100
@@ -20,10 +20,10 @@
 # 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 @@
 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 @@
 %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 @@
        --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 @@
 
 %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@xxxxxxx
+- 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@xxxxxxx
 - Update to 0.96.1
   * Empty initial lines in shapes crashes Dia (BGO #421250).

++++++ dia-0.96-pre3-docs.patch ++++++
--- dia-0.96-pre3/doc/en/usage-layers.xml~      2007-01-21 17:12:45.000000000 
+0100
+++ dia-0.96-pre3/doc/en/usage-layers.xml       2007-02-05 10:23:02.000000000 
+0100
@@ -26,7 +26,7 @@
       </para>
     </tip>
     <para>
-      Each new diagram comes with the default layer labelled �Background�. Of 
course you can change its name and settings to customize it to your needs as 
you can do with any other layer.
+      Each new diagram comes with the default layer labelled “Background”. Of 
course you can change its name and settings to customize it to your needs as 
you can do with any other layer.
     </para>
     <para>
       You can use layers to create overlay slide show by drawing each 
incremental slide in a
++++++ dia-help.patch ++++++
Index: dia-0.96.1/doc/Makefile.am
===================================================================
--- dia-0.96.1.orig/doc/Makefile.am
+++ dia-0.96.1/doc/Makefile.am
@@ -7,11 +7,11 @@ EXTRA_DIST = \
        shape.dtd \
        sheet.dtd
 
-if HAVE_GNOME
+#if HAVE_GNOME
 helpdir = $(datadir)/gnome/help/dia
-else
-helpdir = $(pkgdatadir)/help
-endif
+#else
+#helpdir = $(pkgdatadir)/help
+#endif
 
 # a simple rule to symlink en to C
 install-data-local:
Index: dia-0.96.1/xmldocs.make
===================================================================
--- dia-0.96.1.orig/xmldocs.make
+++ dia-0.96.1/xmldocs.make
@@ -36,11 +36,11 @@
 # **********  Begin of section some packagers may need to modify  **********
 # This variable (docdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-if HAVE_GNOME
+#if HAVE_GNOME
 docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-else
-docdir = $(datadir)/help/$(docname)/$(lang)
-endif
+#else
+#docdir = $(datadir)/help/$(docname)/$(lang)
+#endif
 
 # **********  You should not have to edit below this line  **********
 xml_files = $(entities) $(docname).xml




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx