mtasaka pushed to tempest (master). "Obsoletes -kde subpackage on F-22+"

[notifications at fedoraproject.org]

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


diff --git a/tempest.spec b/tempest.spec
index c052f7c..1305df6 100644
--- a/tempest.spec
+++ b/tempest.spec
@@ -12,7 +12,7 @@
 Name:           tempest
 # There is no version, so we use pre-release style versioning with a date
 Version:        0
-Release:        0.17.%{pkgtimestamp}%{?dist}
+Release:        0.18.%{pkgtimestamp}%{?dist}
 Summary:        Tempest OpenGL screensaver
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -24,6 +24,9 @@ Source3:        %{name}-gss.desktop
 Patch0:         %{name}-20070929-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGL-devel
+%if 0%{?fedora} >= 22
+Obsoletes:		%{name}-kde < 0-0.17.99999999
+%endif
 
 %description
 Tempest is a screensaver based on a physical model whereby particles are
@@ -105,9 +108,11 @@ ln -sv ../../bin/tempest tempest
 popd
 install -p -m0644 %{SOURCE3} %{buildroot}%{_datadir}/applications/screensavers/
 
+%if 0%{?fedora} < 22
 # For KDE
 mkdir -p %{buildroot}%{kdessconfigdir}
 install -p -m0644 %{name}.desktop %{buildroot}%{kdessconfigdir}/
+%endif
 
 
 %clean
@@ -143,12 +148,17 @@ fi
 %{_libexecdir}/gnome-screensaver/%{name}
 
 
+%if 0%{?fedora} < 22
 %files kde
 %defattr(-,root,root,-)
 %{kdessconfigdir}/%{name}.desktop
+%endif
 
 
 %changelog
+* Wed Apr 15 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0-0.18.20081027
+- Obsoletes -kde subpackage on F-22+
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.17.20081027
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tempest.git/commit/?h=master&id=16d56f99cdbdaf0f0c51762b1b1fddeb08f5a424