[kdetoys] 4.11.0

Martin Briza mbriza at fedoraproject.org
Tue Aug 27 13:03:26 UTC 2013


commit 5418b4ecee698d60b9c4e8981388e4ff72877ead
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Aug 27 15:02:47 2013 +0200

    4.11.0
    
    Added the three split tarballs to still be built under this srpm

 .gitignore   |    3 +++
 kdetoys.spec |   42 +++++++++++++++++++++++++++++++-----------
 sources      |    4 +++-
 3 files changed, 37 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8fcee17..a19d9e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 /kdetoys-4.10.2.tar.xz
 /kdetoys-4.10.3.tar.xz
 /kdetoys-4.10.4.tar.xz
+/amor-4.11.0.tar.xz
+/kteatime-4.11.0.tar.xz
+/ktux-4.11.0.tar.xz
diff --git a/kdetoys.spec b/kdetoys.spec
index 83cc5e5..1cc5f08 100644
--- a/kdetoys.spec
+++ b/kdetoys.spec
@@ -1,8 +1,8 @@
 Name:    kdetoys
 Summary: KDE Toys and Amusements
 Epoch:   7
-Version: 4.10.4
-Release: 2%{?dist}
+Version: 4.11.0
+Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
 URL:     http://www.kde.org/
@@ -12,7 +12,9 @@ URL:     http://www.kde.org/
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/%{version}/src/amor-%{version}.tar.xz
+Source1: http://download.kde.org/%{stable}/%{version}/src/kteatime-%{version}.tar.xz
+Source2: http://download.kde.org/%{stable}/%{version}/src/ktux-%{version}.tar.xz
 
 # upstream patches
 
@@ -23,27 +25,40 @@ Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 %{name} includes:
-* amor: Amusing Misuse Of Resources put's comic figures above your windows
+* amor: Amusing Misuse Of Resources puts comic figures above your windows
 * kteatime: makes sure your tea does not get too strong
 * ktux: Tux-in-a-Spaceship screen saver
 
 
 %prep
-%setup -q
+%setup -q -c -n %{name}-%{version} -b 1 -b 2
 
 
 %build
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
+mkdir -p %{_target_platform}/amor-%{version}
+mkdir -p %{_target_platform}/kteatime-%{version}
+mkdir -p %{_target_platform}/ktux-%{version}
+
+pushd %{_target_platform}/amor-%{version}
+%{cmake_kde4} ../../amor-%{version}
+popd
+pushd %{_target_platform}/kteatime-%{version}
+%{cmake_kde4} ../../kteatime-%{version}
+popd
+pushd %{_target_platform}/ktux-%{version}
+%{cmake_kde4} ../../ktux-%{version}
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}/amor-%{version}
+make %{?_smp_mflags} -C %{_target_platform}/kteatime-%{version}
+make %{?_smp_mflags} -C %{_target_platform}/ktux-%{version}
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/amor-%{version}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/kteatime-%{version}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/ktux-%{version}
 
 %find_lang %{name} --all-name --with-kde --without-mo
 
@@ -62,7 +77,8 @@ fi
 
 
 %files -f %{name}.lang
-%doc amor/COPYING*
+%doc amor-%{version}/COPYING*
+%doc ktux-%{version}/AUTHORS
 %{_kde4_bindir}/amor
 %{_kde4_bindir}/kteatime
 %{_kde4_bindir}/ktux
@@ -78,6 +94,10 @@ fi
 
 
 %changelog
+* Tue Aug 27 2013 Martin Briza <mbriza at redhat.com> - 7:4.11.0-1
+- 4.11.0
+- Fixed a typo in the description
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.10.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index dbd1be0..6a73f03 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-dad7099953ed55fa44275864c711976f  kdetoys-4.10.4.tar.xz
+a24ae5cbb4c40257489509c2b1c40ba8  amor-4.11.0.tar.xz
+409b244ba3f600cd8c3198f0951dfe56  kteatime-4.11.0.tar.xz
+2c809fb3edb90f452dbfe0ad8ea41305  ktux-4.11.0.tar.xz


More information about the scm-commits mailing list