mtasaka pushed to qstars (f22). "Obsoletes -kde subpackage on F-22+"

[notifications at fedoraproject.org]

>From bcb0175d04039c96d74687dc131c298c9e917b3d Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Wed, 15 Apr 2015 18:54:25 +0900
Subject: Obsoletes -kde subpackage on F-22+


diff --git a/qstars.spec b/qstars.spec
index 8357a11..f53b56e 100644
--- a/qstars.spec
+++ b/qstars.spec
@@ -9,7 +9,7 @@
 
 Name:           qstars
 Version:        0.4
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A screensaver simulating planets and asteroids in space
 Group:          Amusements/Graphics
 License:        GPL+
@@ -22,6 +22,9 @@ Patch0:         %{name}-0.4-desktop.patch
 Patch1:         qstars-0.4-format-security.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  qt3-devel >= 3.3
+%if 0%{?fedora} >= 22
+Obsoletes:		%{name}-kde < 0.4-15.999
+%endif
 
 %description
 A screensaver which simulates planets, asteroids and ships in a moving
@@ -81,10 +84,12 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_datadir}/xscreensaver/hacks.conf.d/
 
 
 # For KDE
-mkdir -p %{buildroot}%{kdessconfigdir}
 install -p -m0755 %{name} %{buildroot}%{_bindir}/%{name}
 install -p -m0755 %{SOURCE1} %{buildroot}%{_bindir}/
+%if 0%{?fedora} < 22
+mkdir -p %{buildroot}%{kdessconfigdir}
 install -p -m0644 %{name}.desktop %{buildroot}%{kdessconfigdir}
+%endif
 cp -a ships galaxies planets asteroids %{buildroot}%{_datadir}/%{name}/
 
 
@@ -117,12 +122,17 @@ fi
 %{_datadir}/xscreensaver/hacks.conf.d/%{name}.conf
 
 
+%if 0%{?fedora} < 22
 %files kde
 %defattr(-,root,root,-)
 %{kdessconfigdir}/%{name}.desktop
+%endif
 
 
 %changelog
+* Thu Apr 15 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.4-16
+- Obsoletes -kde subpackage on F-22+
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qstars.git/commit/?h=f22&id=bcb0175d04039c96d74687dc131c298c9e917b3d