[kde-settings] * Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-3 - merge the plasma-rpm tarball into th

[Kevin Kofler]

commit 9e4d8abe5a95403faa4df8df53609aa94bfba60c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jan 16 22:43:31 2012 +0100

    * Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-3
    - merge the plasma-rpm tarball into the SVN trunk and thus the main tarball

 .gitignore        |    1 +
 kde-settings.spec |   14 ++++++++------
 sources           |    3 +--
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4496a2a..43685a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /kde-settings-4.7-14.tar.xz
 /kde-settings-4.8-1.tar.xz
 /kde-settings-4.8-2.tar.xz
+/kde-settings-4.8-3.tar.xz
diff --git a/kde-settings.spec b/kde-settings.spec
index a11ff31..cb8d30d 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F17+ ONLY!
 
-%global rel 2
+%global rel 3
 %global system_kde_theme_ver 15.90
 
 Summary: Config files for kde
@@ -12,8 +12,7 @@ Group:   System Environment/Base
 License: MIT
 Url:     http://fedorahosted.org/kde-settings
 Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.xz
-Source1: kde-settings-plasma-rpm-20110927.tar.xz
-Source2: COPYING
+Source1: COPYING
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -75,7 +74,7 @@ Requires: alsa-plugins-pulseaudio
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{rel} -a 1
+%setup -q -n %{name}-%{version}-%{rel}
 
 
 %build
@@ -88,7 +87,7 @@ mkdir -p %{buildroot}{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
 
 tar cpf - . | tar --directory %{buildroot} -xvpf -
 
-cp -p %{SOURCE2} .
+cp -p %{SOURCE1} .
 
 # kdebase/kdm symlink
 rm -rf   %{buildroot}%{_datadir}/config/kdm
@@ -174,8 +173,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-3
+- merge the plasma-rpm tarball into the SVN trunk and thus the main tarball
+
 * Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-2
-- Allow org.kde.kcontrol.kcmclock.save without password for wheel again
+- allow org.kde.kcontrol.kcmclock.save without password for wheel again
 - Requires: polkit (instead of polkit-desktop-policy)
 
 * Mon Jan 16 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8-1
diff --git a/sources b/sources
index 6fe529b..1ad006d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1ba7c8a66a359aaaab650baba3813513  kde-settings-plasma-rpm-20110927.tar.xz
-f200560dc0e5b9644f11d240c3608894  kde-settings-4.8-2.tar.xz
+46900718480b8ce87b2b2e7f6520a71d  kde-settings-4.8-3.tar.xz