Accepting request 590083 from home:mimi_vx:branches:GNOME:Apps

- spec-cleaned
- drop support for python plugin - depends on obsolete python-gtk package
- fix buildrequires
- enable png support

OBS-URL: https://build.opensuse.org/request/show/590083
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=47

dia.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 20 16:22:09 UTC 2018 - mimi.vx@gmail.com
+
+- spec-cleaned
+- drop support for python plugin - depends on obsolete python-gtk package
+- fix buildrequires
+- enable png support
+
 -------------------------------------------------------------------
 Tue Feb 21 10:57:57 UTC 2017 - badshah400@gmail.com
 

dia.spec

@@ -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 @@ Name:           dia
 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-toys
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  gettext
 BuildRequires:  intltool
+BuildRequires:  libEMF-devel
 BuildRequires:  libtool
-BuildRequires:  libxslt-devel
+BuildRequires:  pkgconfig
-BuildRequires:  python-devel
-BuildRequires:  python-gtk-devel
 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 @@ intltoolize --force
 	--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 @@ if [ -f %{buildroot}%{_datadir}/appdata/dia.appdata.xml ]; then
   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 ChangeLog KNOWN_BUGS NEWS README TODO
-%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO
+%license COPYING
 %{_bindir}/*
 %{_libdir}/dia
 %dir %{_datadir}/appdata
@@ -152,10 +141,9 @@ fi
 %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 @@ fi
 %exclude %{_docdir}/%{name}/html/en
 %exclude %{_docdir}/%{name}/*/examples
 %doc %{_docdir}/%{name}/html/*
-%doc %{_mandir}/fr/man1/*.*
+%{_mandir}/fr/man1/*.*
 
 %changelog