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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2014-10-22 16:23:34.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Oct 19 10:44:44 UTC 2014 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.dp24He/_new 2014-10-22 16:23:35.000000000 +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 [email protected] -- 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 [email protected] -- Fix build with libEMF on 64-bit platforms. +Patch20: dia-libemf-64bit.patch +# PATCH-FIX-OPENSUSE dia-enable-html-doc.patch [email protected] -- 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 [email protected] -- 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 [email protected] -- Fix build with libEMF on 64-bit platforms. -Patch20: dia-libemf-64bit.patch -# PATCH-FIX-OPENSUSE dia-enable-html-doc.patch [email protected] -- 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 tarball installs it" + false +else + mkdir -p %{buildroot}%{_datadir}/appdata + cp %{S:4} %{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 @@ -130,6 +138,8 @@ %doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/ font-test*dia %{_bindir}/* %{_libdir}/dia +%dir %{_datadir}/appdata +%{_datadir}/appdata/dia.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/dia %{_datadir}/icons/hicolor/*/apps/dia.* @@ -138,5 +148,6 @@ %doc %{_mandir}/fr/man1/*.* %files lang -f %{name}.lang +%defattr(-,root,root) %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
