commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2020-02-03 11:26:47
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new.26092 (New)
Package is "dia"
Mon Feb 3 11:26:47 2020 rev:49 rq:768659 version:0.97.3
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2020-01-30 09:32:09.581193379
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new.26092/dia.changes 2020-02-03
11:26:48.714137713 +0100
@@ -1,0 +2,5 @@
+Thu Jan 30 11:09:20 UTC 2020 - Dominique Leuenberger
+
+- No longer recommend -lang: supplements are in use
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.S6Wurl/_old 2020-02-03 11:26:50.178137776 +0100
+++ /var/tmp/diff_new_pack.S6Wurl/_new 2020-02-03 11:26:50.178137776 +0100
@@ -67,7 +67,6 @@
BuildRequires: pkgconfig(pango)
Requires: ghostscript-fonts-std
Requires: xdg-utils
-Recommends: %{name}-lang
%description
Dia is designed to be much like the commercial program 'Visio.' It can
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2020-01-30 09:31:26
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new.26092 (New)
Package is "dia"
Thu Jan 30 09:31:26 2020 rev:48 rq:766890 version:0.97.3
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2018-04-05 15:30:23.190876116
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new.26092/dia.changes 2020-01-30
09:32:09.581193379 +0100
@@ -1,0 +2,7 @@
+Thu Jan 23 22:47:12 UTC 2020 - Stefan Brüns
+
+- Remove docbook-toys build dependency, db2html is just an unused
+ leftover in the configure script, only xsltproc is required.
+ Removes build dependency on texlive-jadetex and some more.
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.TLeGOb/_old 2020-01-30 09:32:10.593193920 +0100
+++ /var/tmp/diff_new_pack.TLeGOb/_new 2020-01-30 09:32:10.601193924 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -22,8 +22,8 @@
Summary:A Diagram Creation Program
License:GPL-2.0-or-later
Group: Productivity/Graphics/Other
-Url:http://live.gnome.org/Dia
-Source0:
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
+URL:https://wiki.gnome.org/Dia
+Source0:
https://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
Source1:font-test-japanese.dia
Source2:font-test-czech.dia
Source3:font-test-german-euro.dia
@@ -38,7 +38,6 @@
Patch20:dia-libemf-64bit.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
-BuildRequires: docbook-toys
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -46,8 +45,8 @@
BuildRequires: intltool
BuildRequires: libEMF-devel
BuildRequires: libtool
+BuildRequires: libxslt-tools
BuildRequires: pkgconfig
-BuildRequires: sgml-skel
BuildRequires: swig
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
@@ -100,7 +99,6 @@
intltoolize --force
%configure\
--disable-static\
- --enable-db2html\
--disable-gnome\
--with-cairo\
--with-swig \
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2018-04-05 15:30:21
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new (New)
Package is "dia"
Thu Apr 5 15:30:21 2018 rev:47 rq:592382 version:0.97.3
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2017-03-03 17:39:42.270087117
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2018-04-05
15:30:23.190876116 +0200
@@ -1,0 +2,8 @@
+Tue Mar 20 16:22:09 UTC 2018 - mimi...@gmail.com
+
+- spec-cleaned
+- drop support for python plugin - depends on obsolete python-gtk package
+- fix buildrequires
+- enable png support
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.iEV13C/_old 2018-04-05 15:30:24.486829276 +0200
+++ /var/tmp/diff_new_pack.iEV13C/_new 2018-04-05 15:30:24.486829276 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Version:0.97.3
Release:0
Summary:A Diagram Creation Program
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Productivity/Graphics/Other
Url:http://live.gnome.org/Dia
Source0:
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
@@ -42,31 +42,33 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: gettext
BuildRequires: intltool
+BuildRequires: libEMF-devel
BuildRequires: libtool
-BuildRequires: libxslt-devel
-BuildRequires: python-devel
-BuildRequires: python-gtk-devel
+BuildRequires: pkgconfig
BuildRequires: sgml-skel
BuildRequires: swig
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
BuildRequires: xz
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(freetype2)
+BuildRequires: pkgconfig(gdk-2.0)
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gmodule-2.0)
+BuildRequires: pkgconfig(gthread-2.0)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(libart-2.0)
+BuildRequires: pkgconfig(libexslt)
+BuildRequires: pkgconfig(libpng16)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(libxslt)
+BuildRequires: pkgconfig(pango)
Requires: ghostscript-fonts-std
-Requires: python-gtk
-# for xdg-open
Requires: xdg-utils
Recommends: %{name}-lang
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1210
-BuildRequires: libEMF-devel
-%else
-%ifarch %ix86
-# libEMF was not on x86_64 before 12.2
-BuildRequires: libEMF-devel
-%endif
-%endif
%description
Dia is designed to be much like the commercial program 'Visio.' It can
@@ -100,14 +102,13 @@
--disable-static\
--enable-db2html\
--disable-gnome\
- --with-python\
--with-cairo\
--with-swig \
--docdir=%{_docdir}/%{name}
-make %{?_smp_mflags}
+make VERBOSE=1 %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office
FlowChart
%find_lang %{name} %{?no_lang_C}
@@ -119,26 +120,14 @@
false
else
mkdir -p %{buildroot}%{_datadir}/appdata
- cp %{S:4} %{buildroot}%{_datadir}/appdata/
+ cp %{SOURCE4} %{buildroot}%{_datadir}/appdata/
fi
%fdupes %{buildroot}%{_datadir}
-%if 0%{?suse_version} > 1130
-%post
-%desktop_database_post
-%icon_theme_cache_post
-%endif
-
-%if 0%{?suse_version} > 1130
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-%endif
-
%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO
+%doc AUTHORS ChangeLog KNOWN_BUGS NEWS README TODO
+%license COPYING
%{_bindir}/*
%{_libdir}/dia
%dir %{_datadir}/appdata
@@ -152,10 +141,9 @@
%doc %{_docdir}/%{name}/html/en
# EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en
%doc %{_docdir}/%{name}/*/examples
-%doc %{_mandir}/man1/*.*
+%{_mandir}/man1/*.*
%files lang -f %{name}.lang
-%defattr(-,root,root)
%exclude %{_docdir}/%{name}/AUTHORS
%exclude %{_docdir}/%{name}/COPYING
%exclude %{_docdir}/%{name}/ChangeLog
@@ -170,6 +158,6 @@
%exclude %{_docdir}/%{name}/html/en
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2017-03-03 17:39:41
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new (New)
Package is "dia"
Fri Mar 3 17:39:41 2017 rev:46 rq:460524 version:0.97.3
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2017-02-08 10:51:10.245621239
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2017-03-03
17:39:42.270087117 +0100
@@ -1,0 +2,13 @@
+Tue Feb 21 10:57:57 UTC 2017 - badshah...@gmail.com
+
+- Avoid double inclusion of the contents of the directory
+ %{_docdir}/%{name}, by removing it from the file-list for
+ main package.
+
+---
+Fri Feb 10 11:14:17 UTC 2017 - badshah...@gmail.com
+
+- Make sure to own %{_docdir}/%{name} and lower directories
+ individually by using %doc/%dir wherever appropriate.
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.FpNhjE/_old 2017-03-03 17:39:43.549906266 +0100
+++ /var/tmp/diff_new_pack.FpNhjE/_new 2017-03-03 17:39:43.549906266 +0100
@@ -138,7 +138,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO samples/
font-test*dia
+%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO
%{_bindir}/*
%{_libdir}/dia
%dir %{_datadir}/appdata
@@ -146,15 +146,30 @@
%{_datadir}/applications/*.desktop
%{_datadir}/dia
%{_datadir}/icons/hicolor/*/apps/dia.*
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/en/
+%dir %{_docdir}/%{name}/html
%doc %{_docdir}/%{name}/html/en
# EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en
-%doc %{_docdir}/%{name}/*/examples/
+%doc %{_docdir}/%{name}/*/examples
%doc %{_mandir}/man1/*.*
%files lang -f %{name}.lang
%defattr(-,root,root)
+%exclude %{_docdir}/%{name}/AUTHORS
+%exclude %{_docdir}/%{name}/COPYING
+%exclude %{_docdir}/%{name}/ChangeLog
+%exclude %{_docdir}/%{name}/KNOWN_BUGS
+%exclude %{_docdir}/%{name}/NEWS
+%exclude %{_docdir}/%{name}/README
+%exclude %{_docdir}/%{name}/TODO
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/html
+%exclude %{_docdir}/%{name}/en
+%doc %{_docdir}/%{name}/*
+%exclude %{_docdir}/%{name}/html/en
+%exclude %{_docdir}/%{name}/*/examples
%doc %{_docdir}/%{name}/html/*
%doc %{_mandir}/fr/man1/*.*
-%exclude %{_docdir}/%{name}/html/en
%changelog
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2017-02-08 10:51:08
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 2017-02-03 17:35:37.294361299
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2017-02-08
10:51:10.245621239 +0100
@@ -1,0 +2,11 @@
+Fri Feb 3 13:51:06 UTC 2017 - badshah...@gmail.com
+
+- Fix building with rpm >= 4.13 by explicitly listing %{_docdir}
+ files installed by make. Package the non-C lang documentation
+ in the %{name}-lang package. The examples for all non-C locales
+ are simply symlinks to the C locale example, so these need to
+ be installed as part of the main package itself.
+- Move man for fr locale into lang package (instead of main
+ package).
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.cAa1rF/_old 2017-02-08 10:51:11.045509762 +0100
+++ /var/tmp/diff_new_pack.cAa1rF/_new 2017-02-08 10:51:11.045509762 +0100
@@ -146,10 +146,15 @@
%{_datadir}/applications/*.desktop
%{_datadir}/dia
%{_datadir}/icons/hicolor/*/apps/dia.*
+%doc %{_docdir}/%{name}/html/en
+# EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en
+%doc %{_docdir}/%{name}/*/examples/
%doc %{_mandir}/man1/*.*
-%doc %{_mandir}/fr/man1/*.*
%files lang -f %{name}.lang
%defattr(-,root,root)
+%doc %{_docdir}/%{name}/html/*
+%doc %{_mandir}/fr/man1/*.*
+%exclude %{_docdir}/%{name}/html/en
%changelog
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2017-01-27 10:43:37
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 2015-05-20 23:38:07.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2017-02-03
17:35:37.294361299 +0100
@@ -1,0 +2,6 @@
+Sat Jan 21 01:14:12 UTC 2017 - zai...@opensuse.org
+
+- Drop scrollkeeper BuildRequires: No longer needed.
+- Stop packaging INSTALL in docs.
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.6xQkOA/_old 2017-02-03 17:35:38.038256010 +0100
+++ /var/tmp/diff_new_pack.6xQkOA/_new 2017-02-03 17:35:38.042255444 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,7 +47,6 @@
BuildRequires: libxslt-devel
BuildRequires: python-devel
BuildRequires: python-gtk-devel
-BuildRequires: scrollkeeper
BuildRequires: sgml-skel
BuildRequires: swig
BuildRequires: translation-update-upstream
@@ -139,7 +138,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/
font-test*dia
+%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO samples/
font-test*dia
%{_bindir}/*
%{_libdir}/dia
%dir %{_datadir}/appdata
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2015-05-20 23:38:06
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 2015-04-12 00:09:16.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2015-05-20
23:38:07.0 +0200
@@ -1,0 +2,6 @@
+Tue May 19 00:52:07 UTC 2015 - mgo...@suse.com
+
+- Build docs in the right place: pass --docdir=%{_docdir}/%{name}
+ to configure (boo#931168).
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.P1L38L/_old 2015-05-20 23:38:08.0 +0200
+++ /var/tmp/diff_new_pack.P1L38L/_new 2015-05-20 23:38:08.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -103,7 +103,8 @@
--disable-gnome\
--with-python\
--with-cairo\
- --with-swig
+ --with-swig \
+ --docdir=%{_docdir}/%{name}
make %{?_smp_mflags}
%install
@@ -146,7 +147,6 @@
%{_datadir}/applications/*.desktop
%{_datadir}/dia
%{_datadir}/icons/hicolor/*/apps/dia.*
-%doc %{_datadir}/doc/dia
%doc %{_mandir}/man1/*.*
%doc %{_mandir}/fr/man1/*.*
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2015-04-12 00:09:15
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 2014-10-22 16:23:34.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2015-04-12
00:09:16.0 +0200
@@ -1,0 +2,6 @@
+Thu Apr 9 11:36:48 UTC 2015 - dims...@opensuse.org
+
+- Add dia-intltool-0.51.patch: Fix installation of translations
+ using intltool 0.51.
+
+---
New:
dia-intltool-0.51.patch
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.25AHEd/_old 2015-04-12 00:09:17.0 +0200
+++ /var/tmp/diff_new_pack.25AHEd/_new 2015-04-12 00:09:17.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@
Source2:font-test-czech.dia
Source3:font-test-german-euro.dia
Source4:dia.appdata.xml
+# PATCH-FIX-UPSTREAM dia-intltool-0.51.patch bgo#737255 dims...@opensuse.org
-- Fix installation of locales with intltool 0.51
+Patch0: dia-intltool-0.51.patch
# PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
Patch3: dia-0.92.2-no-strict-aliasing.patch
# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vu...@novell.com -- Do not put
date/time in the compiled binary (needed for build-compare)
@@ -85,6 +87,7 @@
%prep
%setup -q
translation-update-upstream
+%patch0 -p1
%patch3
%patch17 -p1
%patch20 -p1
++ dia-intltool-0.51.patch ++
From 8ad49dc88f0cbd6410798707025091b5a964cba6 Mon Sep 17 00:00:00 2001
From: Hans Breuer h...@breuer.org
Date: Sat, 27 Sep 2014 22:03:03 +0200
Subject: Bug 737255 - don't mess with localedir
According to Pacho Ramos https://bugzilla.gnome.org/show_bug.cgi?id=737255
diff --git a/configure.in b/configure.in
index 4c0bbea..b14c31b 100644
--- a/configure.in
+++ b/configure.in
@@ -381,9 +381,6 @@ dnl INTLOBJS doesn't seem to always get subst'ed, but I
believe it's
dnl idempotent
AC_SUBST(INTLOBJS)
-localedir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(localedir)
-
dnl
dnl Locate the gnome-xml library
dnl
--
cgit v0.10.2
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2014-10-22 16:23:32
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 2014-09-23 13:46:24.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2014-10-22
16:23:34.0 +0200
@@ -1,0 +2,8 @@
+Sun Oct 19 10:44:44 UTC 2014 - dims...@opensuse.org
+
+- Add dia.appdata.xml: allow DIA to show up as an application in
+ gnome-software (installation will abort when upstream ships the
+ file).
+- Run spec-cleaner.
+
+---
New:
dia.appdata.xml
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.dp24He/_old 2014-10-22 16:23:35.0 +0200
+++ /var/tmp/diff_new_pack.dp24He/_new 2014-10-22 16:23:35.0 +0200
@@ -17,19 +17,30 @@
Name: dia
+Version:0.97.3
+Release:0
+Summary:A Diagram Creation Program
+License:GPL-2.0+
+Group: Productivity/Graphics/Other
+Url:http://live.gnome.org/Dia
+Source0:
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
+Source1:font-test-japanese.dia
+Source2:font-test-czech.dia
+Source3:font-test-german-euro.dia
+Source4:dia.appdata.xml
+# PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
+Patch3: dia-0.92.2-no-strict-aliasing.patch
+# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vu...@novell.com -- Do not put
date/time in the compiled binary (needed for build-compare)
+Patch17:dia-remove-datetime.patch
+# PATCH-FIX-UPSTREAM dia-libemf-64bit.patch bgo#675495 sbra...@suse.cz -- Fix
build with libEMF on 64-bit platforms.
+Patch20:dia-libemf-64bit.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
BuildRequires: docbook-toys
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: intltool
-%if 0%{?suse_version} 1210
-BuildRequires: libEMF-devel
-%else
-%ifarch %ix86
-# libEMF was not on x86_64 before 12.2
-BuildRequires: libEMF-devel
-%endif
-%endif
BuildRequires: libtool
BuildRequires: libxslt-devel
BuildRequires: python-devel
@@ -45,26 +56,16 @@
Requires: python-gtk
# for xdg-open
Requires: xdg-utils
-Summary:A Diagram Creation Program
-License:GPL-2.0+
-Group: Productivity/Graphics/Other
-Version:0.97.3
-Release:0
-Source:
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
-Source1:font-test-japanese.dia
-Source2:font-test-czech.dia
-Source3:font-test-german-euro.dia
-# PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
-Patch3: dia-0.92.2-no-strict-aliasing.patch
-# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vu...@novell.com -- Do not put
date/time in the compiled binary (needed for build-compare)
-Patch17:dia-remove-datetime.patch
-# PATCH-FIX-UPSTREAM dia-libemf-64bit.patch bgo#675495 sbra...@suse.cz -- Fix
build with libEMF on 64-bit platforms.
-Patch20:dia-libemf-64bit.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
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} 1210
+BuildRequires: libEMF-devel
+%else
+%ifarch %ix86
+# libEMF was not on x86_64 before 12.2
+BuildRequires: libEMF-devel
+%endif
+%endif
%description
Dia is designed to be much like the commercial program 'Visio.' It can
@@ -80,6 +81,7 @@
pages).
%lang_package
+
%prep
%setup -q
translation-update-upstream
@@ -102,24 +104,30 @@
make %{?_smp_mflags}
%install
-%makeinstall
-find %{buildroot} -type f -name *.la -exec %{__rm} -fv {} +
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name *.la -delete -print
%suse_update_desktop_file -r -N Dia -C -G Diagram Editor dia Office
FlowChart
%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
+rm -r %{buildroot}%{_datadir}/mime-info
rm samples/Makefile* samples/*png
+if [ -f %{buildroot}%{_datadir}/appdata/dia.appdata.xml ]; then
+ echo Please remove the added dia.appdata.xml file from the sources - the
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2014-09-23 13:46:23
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 2014-03-01 07:47:33.0
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2014-09-23
13:46:24.0 +0200
@@ -1,0 +2,21 @@
+Wed Sep 17 23:44:48 UTC 2014 - dims...@opensuse.org
+
+- Update to version 0.97.3:
+ + Fix double free with some SVG rendering (regression from Dia
+0.97.2).
+ + Fixes to cope better with updated versions of Dia's
+dependencies:
+- don't crash at start-up with ABI breaking GLib 2-36.
+- don't assert in cairo 1.12 with invalid arc parameters.
+- avoid kerning problems (character overlap) for all Pango
+ versions.
+- fix image files to be loadable by libpng16.
+ + Backport fixes for some seldom crashes and other annoyances.
+ + Updated translations.
+- Drop upstream fixed patches:
+ + dia-glib-2.31.patch.
+ + dia-glib-2.35.patch.
+ + dia-swig-2x.patch.
+ + dia-use-recommended-freetype-include.patch.
+
+---
Old:
dia-0.97.2.tar.xz
dia-glib-2.31.patch
dia-glib-2.35.patch
dia-swig-2x.patch
dia-use-recommended-freetype-include.patch
New:
dia-0.97.3.tar.xz
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.KzvpKD/_old 2014-09-23 13:46:25.0 +0200
+++ /var/tmp/diff_new_pack.KzvpKD/_new 2014-09-23 13:46:25.0 +0200
@@ -48,7 +48,7 @@
Summary:A Diagram Creation Program
License:GPL-2.0+
Group: Productivity/Graphics/Other
-Version:0.97.2
+Version:0.97.3
Release:0
Source:
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
Source1:font-test-japanese.dia
@@ -58,16 +58,8 @@
Patch3: dia-0.92.2-no-strict-aliasing.patch
# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vu...@novell.com -- Do not put
date/time in the compiled binary (needed for build-compare)
Patch17:dia-remove-datetime.patch
-# PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 idoen...@suse.de -- Support
swig 2.x
-Patch18:dia-swig-2x.patch
-# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 dims...@opensuse.org --
Fix build with glib 2.31.
-Patch19:dia-glib-2.31.patch
# PATCH-FIX-UPSTREAM dia-libemf-64bit.patch bgo#675495 sbra...@suse.cz -- Fix
build with libEMF on 64-bit platforms.
Patch20:dia-libemf-64bit.patch
-# PATCH-FIX-UPSTREAM dia-glib-2.35.patch bgo#694025 bnc#835972
dims...@opensuse.org -- GLib drop support for adding interfaces after
class_init, taken from git
-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
@@ -93,11 +85,7 @@
translation-update-upstream
%patch3
%patch17 -p1
-%patch18
-%patch19 -p1
%patch20 -p1
-%patch21 -p1
-%patch22 -p1
%patch23 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
++ dia-0.97.2.tar.xz - dia-0.97.3.tar.xz ++
170055 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dia for openSUSE:Factory
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.0
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2014-03-01
07:47:33.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.Cn6MOw/_new 2014-03-01 07:47:34.0 +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
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2013-12-17 10:00:59
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-08-27 20:40:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2013-12-17
10:01:00.0 +0100
@@ -1,0 +2,8 @@
+Sat Dec 14 18:25:30 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added dia-use-recommended-freetype-include.patch: Freetype
+ upstream recommends using their macros together with ft2build
+ include. Positive sideeffect is that this patch makes it build
+ with both freetype2 2.5.1, and older versions (bgo#720573).
+
+---
New:
dia-use-recommended-freetype-include.patch
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.tlQeFR/_old 2013-12-17 10:01:01.0 +0100
+++ /var/tmp/diff_new_pack.tlQeFR/_new 2013-12-17 10:01:01.0 +0100
@@ -66,6 +66,8 @@
Patch20:dia-libemf-64bit.patch
# PATCH-FIX-UPSTREAM dia-glib-2.35.patch bgo#694025 bnc#835972
dims...@opensuse.org -- GLib drop support for adding interfaces after
class_init, taken from git
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
Url:http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@@ -93,6 +95,7 @@
%patch19 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
%build
++ dia-use-recommended-freetype-include.patch ++
--- a/plug-ins/postscript/diapsft2renderer.c2009-11-07 11:13:53.0
-0600
+++ b/plug-ins/postscript/diapsft2renderer.c2013-12-02 18:49:27.0
-0600
@@ -29,8 +29,9 @@
#include pango/pangoft2.h
#include pango/pango-engine.h
/* I'd really rather avoid this */
-#include freetype/ftglyph.h
-#include freetype/ftoutln.h
+#include ft2build.h
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
#define DPI 300
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2013-08-27 20:40:32
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-01-20 12:11:54.0
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2013-08-27
20:40:33.0 +0200
@@ -1,0 +2,6 @@
+Sat Aug 24 19:20:09 UTC 2013 - dims...@opensuse.org
+
+- Add dia-glib-2.35.patch: GLib drop support for adding interfaces
+ after class_init.
+
+---
New:
dia-glib-2.35.patch
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.txyaz6/_old 2013-08-27 20:40:33.0 +0200
+++ /var/tmp/diff_new_pack.txyaz6/_new 2013-08-27 20:40:33.0 +0200
@@ -64,6 +64,8 @@
Patch19:dia-glib-2.31.patch
# PATCH-FIX-UPSTREAM dia-libemf-64bit.patch bgo#675495 sbra...@suse.cz -- Fix
build with libEMF on 64-bit platforms.
Patch20:dia-libemf-64bit.patch
+# PATCH-FIX-UPSTREAM dia-glib-2.35.patch bgo#694025 bnc#835972
dims...@opensuse.org -- GLib drop support for adding interfaces after
class_init, taken from git
+Patch21:dia-glib-2.35.patch
Url:http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@@ -90,6 +92,7 @@
%patch18
%patch19 -p1
%patch20 -p1
+%patch21 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
%build
++ dia-glib-2.35.patch ++
From 7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0 Mon Sep 17 00:00:00 2001
From: Hans Breuer h...@breuer.org
Date: Sat, 16 Mar 2013 16:56:58 +
Subject: Bug 694025 - GLib drop support for adding interfaces after class_init
Without this Dia crashes at startup with new GLib version and the
DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which
follows the pattern also used for DiaCairoInteraciveRenderer. This should
be functional equivalent to what was there before and should work for all
current GLib versions.
(cherry picked from commit 213bdfe956bf8fe57c86316f68a09408fef1647e)
---
diff --git a/app/render_gdk.c b/app/render_gdk.c
index 60ccb7a..b1e7ba4 100644
--- a/app/render_gdk.c
+++ b/app/render_gdk.c
@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer *renderer,
gpointer window,
int x, int y, int width, int height);
-static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface*
iface)
+typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
+struct _DiaGdkInteractiveRenderer
+{
+ DiaGdkRenderer parent_instance; /*! inheritance in object oriented C */
+};
+typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
+struct _DiaGdkInteractiveRendererClass
+{
+ DiaGdkRendererClass parent_class; /*! the base class */
+};
+#define DIA_TYPE_GDK_INTERACTIVE_RENDERER
(dia_gdk_interactive_renderer_get_type ())
+#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
+
+static void
+dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
{
iface-clip_region_clear = clip_region_clear;
iface-clip_region_add_rect = clip_region_add_rect;
@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init
(DiaInteractiveRendererInterface* iface)
iface-set_size = set_size;
}
+G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer,
dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
+G_IMPLEMENT_INTERFACE
(DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
+
+static void
+dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
+{
+}
+static void
+dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
+{
+ DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER
(object);
+ DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
+ DiaRenderer *dia_renderer = DIA_RENDERER(object);
+
+ dia_renderer-is_interactive = 1;
+
+ renderer-gc = NULL;
+ renderer-pixmap = NULL;
+ renderer-clip_region = NULL;
+}
+
DiaRenderer *
new_gdk_renderer(DDisplay *ddisp)
{
DiaGdkRenderer *renderer;
GType renderer_type = 0;
- renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
+ renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
renderer-transform = dia_transform_new (ddisp-visible,
ddisp-zoom_factor);
- if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
-{
- static const GInterfaceInfo irenderer_iface_info =
- {
-(GInterfaceInitFunc) dia_gdk_renderer_iface_init,
-
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2013-01-20 12:11:51
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new (New)
Package is dia, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2012-10-03 10:24:12.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2013-01-20
12:11:54.0 +0100
@@ -1,0 +2,6 @@
+Sat Jan 19 17:19:48 UTC 2013 - dims...@opensuse.org
+
+- Only run fdupes on %{_datadir} (where the duplicates are) and
+ make hardlinks.
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.5jdscx/_old 2013-01-20 12:11:56.0 +0100
+++ /var/tmp/diff_new_pack.5jdscx/_new 2013-01-20 12:11:56.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -116,7 +116,7 @@
# 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
rm samples/Makefile* samples/*png
-%fdupes -s $RPM_BUILD_ROOT
+%fdupes %{buildroot}%{_datadir}
%if 0%{?suse_version} 1130
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2012-10-03 10:24:11
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new (New)
Package is dia, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2012-08-23 16:02:56.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2012-10-03
10:24:12.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 25 17:35:23 CEST 2012 - sbra...@suse.cz
+
+- Add dia-libemf-64bit.patch: Fix 64-bit build with libEMF, which
+ is now available on all platforms (bgo#675495).
+
+---
New:
dia-libemf-64bit.patch
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.tWNxOW/_old 2012-10-03 10:24:13.0 +0200
+++ /var/tmp/diff_new_pack.tWNxOW/_new 2012-10-03 10:24:13.0 +0200
@@ -21,10 +21,14 @@
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: intltool
+%if 0%{?suse_version} 1210
+BuildRequires: libEMF-devel
+%else
%ifarch %ix86
-# libEMF is not on x86_64
+# libEMF was not on x86_64 before 12.2
BuildRequires: libEMF-devel
%endif
+%endif
BuildRequires: libgnomeui-devel
BuildRequires: libtool
BuildRequires: libxslt-devel
@@ -58,6 +62,8 @@
Patch18:dia-swig-2x.patch
# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 dims...@opensuse.org --
Fix build with glib 2.31.
Patch19:dia-glib-2.31.patch
+# PATCH-FIX-UPSTREAM dia-libemf-64bit.patch bgo#675495 sbra...@suse.cz -- Fix
build with libEMF on 64-bit platforms.
+Patch20:dia-libemf-64bit.patch
Url:http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@@ -83,6 +89,7 @@
%patch17 -p1
%patch18
%patch19 -p1
+%patch20 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
%build
++ dia-libemf-64bit.patch ++
From 222d8f1b5c47408900638955b094b6a6e28dcc20 Mon Sep 17 00:00:00 2001
From: Hans Breuer h...@breuer.org
Date: Sun, 20 May 2012 17:35:26 +
Subject: Bug 675495 - Compile error with libEMF on 64bit
We have to define STRICT to make libemf/64 work. Otherwise there is
wmf.cpp:1383:40: error: cast from 'void*' to 'W32::HDC' loses precision
---
Index: dia-0.97.2/plug-ins/wmf/wmf.cpp
===
--- dia-0.97.2.orig/plug-ins/wmf/wmf.cpp
+++ dia-0.97.2/plug-ins/wmf/wmf.cpp
@@ -53,9 +53,14 @@ typedef W32::LOGFONTW LOGFONTW;
#include pango/pangowin32.h
#elif HAVE_LIBEMF
+/* We have to define STRICT to make libemf/64 work. Otherwise there is
+wmf.cpp:1383:40: error: cast from 'void*' to 'W32::HDC' loses precision
+ */
+#define STRICT
namespace W32 {
# include emf.h
}
+#undef STRICT
#else
# include wmf_gdi.h
# define SAVE_EMF
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2012-08-23 16:02:55
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new (New)
Package is dia, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2012-01-05 19:10:31.0
+0100
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2012-08-23
16:02:56.0 +0200
@@ -1,0 +2,5 @@
+Wed Aug 15 09:38:09 UTC 2012 - dims...@opensuse.org
+
+- No longer move sr@Latn to sr@latin.
+
+---
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.kxaNZf/_old 2012-08-23 16:02:58.0 +0200
+++ /var/tmp/diff_new_pack.kxaNZf/_new 2012-08-23 16:02:58.0 +0200
@@ -101,8 +101,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
-# Change sr@Latn to sr@latin
-mv %{buildroot}%{_datadir}/locale/sr@Latn
%{buildroot}%{_datadir}/locale/sr@latin
# 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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory checked in
at 2012-01-05 19:10:30
Comparing /work/SRC/openSUSE:Factory/dia (Old)
and /work/SRC/openSUSE:Factory/.dia.new (New)
Package is dia, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:Factory/dia/dia.changes 2011-10-04 18:08:58.0
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2012-01-05
19:10:31.0 +0100
@@ -1,0 +2,19 @@
+Wed Jan 4 09:47:29 UTC 2012 - vu...@opensuse.org
+
+- Update to version 0.97.2:
+ + More colors for SADT.
+ + Various bug fixes, including:
+- crashes
+- fixes to SVG, PNG and Xfig exports
+ + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+ xz-compressed tarball without explicitly specifying that... See
+ bnc#697467 for more details.
+- Drop dia-python-acinclude.patch: fixed upstream.
+
+---
+Thu Dec 1 21:09:34 UTC 2011 - dims...@opensuse.org
+
+- Add dia-glib-2.31.patch: Fix build with glib 2.31.
+
+---
Old:
dia-0.97.1.tar.bz2
dia-python-acinclude.patch
New:
dia-0.97.2.tar.xz
dia-glib-2.31.patch
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.Kr685Z/_old 2012-01-05 19:10:32.0 +0100
+++ /var/tmp/diff_new_pack.Kr685Z/_new 2012-01-05 19:10:32.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dia
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -16,7 +16,6 @@
#
-
Name: dia
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@@ -36,27 +35,29 @@
BuildRequires: swig
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-License:GPLv2+
-Group: Productivity/Graphics/Other
+# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
+BuildRequires: xz
Requires: ghostscript-fonts-std
Requires: python-gtk
# for xdg-open
Requires: xdg-utils
Summary:A Diagram Creation Program
-Version:0.97.1
-Release:11
-Source:
ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
+License:GPL-2.0+
+Group: Productivity/Graphics/Other
+Version:0.97.2
+Release:0
+Source:
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
Source1:font-test-japanese.dia
Source2:font-test-czech.dia
Source3:font-test-german-euro.dia
# PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
Patch3: dia-0.92.2-no-strict-aliasing.patch
-# PATCH-FIX-UPSTREAM bgo581533 dia-python-acinclude.patch
-Patch14:dia-python-acinclude.patch
# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vu...@novell.com -- Do not put
date/time in the compiled binary (needed for build-compare)
Patch17:dia-remove-datetime.patch
# PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 idoen...@suse.de -- Support
swig 2.x
Patch18:dia-swig-2x.patch
+# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 dims...@opensuse.org --
Fix build with glib 2.31.
+Patch19:dia-glib-2.31.patch
Url:http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@@ -79,9 +80,9 @@
%setup -q
translation-update-upstream
%patch3
-%patch14
%patch17 -p1
%patch18
+%patch19 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
%build
++ dia-glib-2.31.patch ++
Index: dia-0.97.1/objects/custom/shape_typeinfo.c
===
--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
+++ dia-0.97.1/objects/custom/shape_typeinfo.c
@@ -27,7 +27,7 @@
#include custom_util.h
#include string.h
#include stdarg.h
-#include glib/gstrfuncs.h
+#include glib.h
#include glib/gstdio.h
#include libxml/parser.h
Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
===
--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
+++ dia-0.97.1/plug-ins/pgf/render_pgf.c
@@ -61,7 +61,7 @@ TODO:
#endif
#include errno.h
-#include glib/gprintf.h
+#include glib.h
#include glib/gstdio.h
#include intl.h
Index: dia-0.97.1/tests/test-boundingbox.c
===
--- dia-0.97.1.orig/tests/test-boundingbox.c
+++
commit dia for openSUSE:Factory
Hello community, here is the log from the commit of package dia for openSUSE:Factory checked in at Tue Oct 4 18:08:58 CEST 2011. --- openSUSE:Factory/dia/dia.changes2011-10-02 09:57:10.0 +0200 +++ /mounts/work_src_done/STABLE/dia/dia.changes2011-09-30 22:11:42.0 +0200 @@ -1,0 +2,5 @@ +Fri Sep 30 20:07:54 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to make the spec file more reliable + +--- calling whatdependson for head-i586 Other differences: -- ++ dia.spec ++ --- /var/tmp/diff_new_pack.4hBsRI/_old 2011-10-04 18:08:54.0 +0200 +++ /var/tmp/diff_new_pack.4hBsRI/_new 2011-10-04 18:08:54.0 +0200 @@ -27,6 +27,7 @@ BuildRequires: libEMF-devel %endif BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: libxslt-devel BuildRequires: python-devel BuildRequires: python-gtk-devel continue with q... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dia for openSUSE:Factory
Hello community,
here is the log from the commit of package dia for openSUSE:Factory
checked in at Thu May 26 15:40:41 CEST 2011.
--- GNOME/dia/dia.changes 2011-02-12 20:23:58.0 +0100
+++ /mounts/work_src_done/STABLE/dia/dia.changes2011-05-26
11:07:42.0 +0200
@@ -1,0 +2,5 @@
+Thu May 26 09:06:36 UTC 2011 - idon...@novell.com
+
+- Add dia-swig-2x.patch: fix compilation with swig 2.x
+
+---
calling whatdependson for head-i586
New:
dia-swig-2x.patch
Other differences:
--
++ dia.spec ++
--- /var/tmp/diff_new_pack.9JrQrH/_old 2011-05-26 15:39:54.0 +0200
+++ /var/tmp/diff_new_pack.9JrQrH/_new 2011-05-26 15:39:54.0 +0200
@@ -44,7 +44,7 @@
Requires: xdg-utils
Summary:A Diagram Creation Program
Version:0.97.1
-Release:6
+Release:11
Source:
ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
Source1:font-test-japanese.dia
Source2:font-test-czech.dia
@@ -55,6 +55,8 @@
Patch14:dia-python-acinclude.patch
# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vu...@novell.com -- Do not put
date/time in the compiled binary (needed for build-compare)
Patch17:dia-remove-datetime.patch
+# PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 idoen...@suse.de -- Support
swig 2.x
+Patch18:dia-swig-2x.patch
Url:http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@@ -79,6 +81,7 @@
%patch3
%patch14
%patch17 -p1
+%patch18
cp $RPM_SOURCE_DIR/font-test*dia .
%build
++ dia-swig-2x.patch ++
--- acinclude.m4.orig 2011-05-26 11:30:59.298022408 +0200
+++ acinclude.m42011-05-26 11:31:24.602022413 +0200
@@ -391,9 +391,87 @@
AC_SUBST(FT2_LIBS)
])
-##
-## SWIG check from http://autoconf-archive.cryp.to/ac_pkg_swig.html
-##
+
+# http://autoconf-archive.cryp.to/ac_pkg_swig.html
+#
+# SYNOPSIS
+#
+# AC_PROG_SWIG([major.minor.micro])
+#
+# DESCRIPTION
+#
+# This macro searches for a SWIG installation on your system. If
+# found you should call SWIG via $(SWIG). You can use the optional
+# first argument to check if the version of the available SWIG is
+# greater than or equal to the value of the argument. It should have
+# the format: N[.N[.N]] (N is a number between 0 and 999. Only the
+# first N is mandatory.)
+#
+# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks
+# that the swig package is this version number or higher.
+#
+# In configure.in, use as:
+#
+# AC_PROG_SWIG(1.3.17)
+# SWIG_ENABLE_CXX
+# SWIG_MULTI_MODULE_SUPPORT
+# SWIG_PYTHON
+#
+# LAST MODIFICATION
+#
+# 2006-10-22
+#
+# COPYLEFT
+#
+# Copyright (c) 2006 Sebastian Huber sebastian-hu...@web.de
+# Copyright (c) 2006 Alan W. Irwin ir...@beluga.phys.uvic.ca
+# Copyright (c) 2006 Rafael Laboissiere raf...@laboissiere.net
+# Copyright (c) 2006 Andrew Collier colli...@ukzn.ac.za
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# As a special exception, the respective Autoconf Macro's copyright
+# owner gives unlimited permission to copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts, even though
+# portions of the text of the Macro appear in them. The GNU General
+# Public License (GPL) does govern all other use of the material that
+# constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the
+# Autoconf Macro released by the Autoconf Macro Archive. When you
+# make and distribute a modified version of the Autoconf Macro, you
+# may extend this special exception to the GPL to apply to your
+# modified version as well.
+
+AC_DEFUN([SWIG_VERSION_GOOD],[
+ AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+SWIG_LIB=`$SWIG -swiglib`
+AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+SWIG_VERSION=`echo $(( $available_major * 100 * 100 +
