Hello community, here is the log from the commit of package dia for openSUSE:Factory checked in at 2014-03-01 07:47:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dia (Old) and /work/SRC/openSUSE:Factory/.dia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dia" Changes: -------- --- /work/SRC/openSUSE:Factory/dia/dia.changes 2013-12-17 10:01:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2014-03-01 07:47:33.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 26 21:43:05 UTC 2014 - mgo...@suse.com + +- Remove libgnomeui support. Libgnomeui is deprecated, and session + management does not appear to be working well anyhow with GNOME 3. +- Remove help files from GNOME directories +- Add dia-enable-html-doc.patch -- always build html docs, as they + are needed for online help. Ie, don't require --with-hardbooks. + +------------------------------------------------------------------- New: ---- dia-enable-html-doc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.Cn6MOw/_old 2014-03-01 07:47:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Cn6MOw/_new 2014-03-01 07:47:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dia # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ Name: dia +BuildRequires: docbook-toys BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gcc-c++ @@ -29,7 +30,6 @@ BuildRequires: libEMF-devel %endif %endif -BuildRequires: libgnomeui-devel BuildRequires: libtool BuildRequires: libxslt-devel BuildRequires: python-devel @@ -68,6 +68,8 @@ Patch21: dia-glib-2.35.patch # PATCH-FIX-UPSTREAM dia-use-recommended-freetype-include.patch bgo#720573 hrvoje.sen...@gmail.com -- Freetype upstream recommends using their macros together with ft2build include. Fix build with old and new freetype versions Patch22: dia-use-recommended-freetype-include.patch +# PATCH-FIX-OPENSUSE dia-enable-html-doc.patch mgo...@suse.com -- Always enable html docs if xsltproc present. +Patch23: dia-enable-html-doc.patch Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang @@ -96,6 +98,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 cp $RPM_SOURCE_DIR/font-test*dia . %build @@ -104,7 +107,7 @@ %configure\ --disable-static\ --enable-db2html\ - --enable-gnome\ + --disable-gnome\ --with-python\ --with-cairo\ --with-swig @@ -114,10 +117,6 @@ %makeinstall find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + %suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart -# Workaround for bgo#581537: the C help is just a symlink to the en help. But -# find_lang doesn't like this -rm %{buildroot}%{_datadir}/gnome/help/dia/C -mv %{buildroot}%{_datadir}/gnome/help/dia/en %{buildroot}%{_datadir}/gnome/help/dia/C %find_lang %{name} %{?no_lang_C} # 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 @@ -141,13 +140,6 @@ %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/ font-test*dia -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/* %{_libdir}/dia %{_datadir}/applications/*.desktop ++++++ dia-enable-html-doc.patch ++++++ >From 9d0973e21955205c7b334a4447e2418e246aaeeb Mon Sep 17 00:00:00 2001 From: Mike Gorse <mgo...@linux-sh69.site> Date: Thu, 13 Feb 2014 18:44:37 -0600 Subject: [PATCH] Always enable html docs --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index bfca467..50bef62 100644 --- a/configure.in +++ b/configure.in @@ -602,7 +602,7 @@ hardbook_ok=no xsltproc_ok=no if test "x$with_hardbooks" = "xno"; then AM_CONDITIONAL(WITH_JW, test "xno" != "xno") - AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno") + AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno") AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno") AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno") else -- 1.8.5.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
