From a73e70f2ca236017f0f082a4b641aab19c504343 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 27 Nov 2015 17:39:09 +0200 Subject: [PATCH] Macros %suse_update_desktop_file. --HG-- branch : develop --- dist/rpm/valentina.spec | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index eae758ea5..49e950125 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -7,23 +7,23 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils # Fedora specifics -#%if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 -#BuildRequires: qt5-qtbase-devel >= 5.0.0 -#BuildRequires: pkgconfig(Qt5Svg) -#BuildRequires: pkgconfig(Qt5Core) -#BuildRequires: pkgconfig(Qt5Gui) -#BuildRequires: pkgconfig(Qt5Network) -#BuildRequires: pkgconfig(Qt5PrintSupport) -#BuildRequires: pkgconfig(Qt5Widgets) -#BuildRequires: pkgconfig(Qt5Xml) -#BuildRequires: qt5-qtxmlpatterns-devel >= 5.0.0 -#BuildRequires: qt5-qtsvg-devel >= 5.0.0 -#BuildRequires: qt5-qttools-devel >= 5.0.0 +%if 0%{?fedora_version} > 0 +BuildRequires: qt5-qtbase-devel >= 5.0.0 +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: qt5-qtxmlpatterns-devel >= 5.0.0 +BuildRequires: qt5-qtsvg-devel >= 5.0.0 +BuildRequires: qt5-qttools-devel >= 5.0.0 -#Requires: qt5-qtsvg >= 5.0.0 -#Requires: qt5-qtbase-gui >= 5.0.0 -#Requires: qt5-qtxmlpatterns >= 5.0.0 -#%endif +Requires: qt5-qtsvg >= 5.0.0 +Requires: qt5-qtbase-gui >= 5.0.0 +Requires: qt5-qtxmlpatterns >= 5.0.0 +%endif # SUSE Specifics %if 0%{?suse_version} > 0 @@ -101,7 +101,8 @@ cp dist/debian/valentina.mime dist/debian/%{name} && %{__install} -Dm 644 dist/debian/%{name} %{buildroot}%{_libdir}/mime/packages/%{name} %if 0%{?suse_version} > 0 -%suse_update_desktop_file -r %{name} VectorGraphics +%suse_update_desktop_file %{name} +%suse_update_desktop_file tape %endif %post @@ -118,7 +119,7 @@ fi %posttrans # Fedora specifics -%if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 +%if 0%{?fedora_version} > 0 /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %else /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : @@ -154,6 +155,6 @@ rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/%{name}.xml dis %changelog -* Mon Nov 27 2015 Roman Telezhinskyi +* Fri Nov 27 2015 Roman Telezhinskyi - Auto build