From d82ec2b19674e4ee1009095526434e3b25028f77 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 31 2014 14:33:21 +0000 Subject: 1.0.5 --- diff --git a/.gitignore b/.gitignore index 5ab60b5..ba6e953 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libkscreen-1.0.4.tar.xz +/libkscreen-1.0.5.tar.xz diff --git a/libkscreen-1.0.5-VERSION_RELEASE.patch b/libkscreen-1.0.5-VERSION_RELEASE.patch new file mode 100644 index 0000000..60a4f31 --- /dev/null +++ b/libkscreen-1.0.5-VERSION_RELEASE.patch @@ -0,0 +1,12 @@ +diff -up libkscreen-1.0.5/CMakeLists.txt.VERSION_RELEASE libkscreen-1.0.5/CMakeLists.txt +--- libkscreen-1.0.5/CMakeLists.txt.VERSION_RELEASE 2014-08-03 16:14:49.000000000 -0500 ++++ libkscreen-1.0.5/CMakeLists.txt 2014-10-31 09:32:07.361195742 -0500 +@@ -1,7 +1,7 @@ + project(libkscreen) + set(libkscreen_VERSION_MAJOR 1) + set(libkscreen_VERSION_MINOR 0) +-set(libkscreen_VERSION_RELEASE 4) ++set(libkscreen_VERSION_RELEASE 5) + set(libkscreen_VERSION "${libkscreen_VERSION_MAJOR}.${libkscreen_VERSION_MINOR}.${libkscreen_VERSION_RELEASE}") + add_definitions("-DLIBKSCREEN_VERSION=\\\"${libkscreen_VERSION}\\\"") + diff --git a/libkscreen.spec b/libkscreen.spec index de78221..610dec3 100644 --- a/libkscreen.spec +++ b/libkscreen.spec @@ -1,7 +1,7 @@ Name: libkscreen Epoch: 1 -Version: 1.0.4 -Release: 4%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: Display configuration library License: GPLv2+ @@ -9,6 +9,10 @@ URL: https://projects.kde.org/projects/extragear/libs/libkscreen Source0: http://download.kde.org/stable/libkscreen/%{version}/src/libkscreen-%{version}.tar.xz +## upstreamable patches +# already fixed upstream (to 1.0.6 now) +Patch1: libkscreen-1.0.5-VERSION_RELEASE.patch + ## upstream patches BuildRequires: kdelibs4-devel @@ -31,6 +35,8 @@ developing applications that use %{name}. %prep %setup -q +%patch1 -p1 -b .VERSION_RELEASE + %build mkdir -p %{_target_platform} @@ -46,15 +52,13 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %check # verify pkgconfig version -export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig +export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig test "$(pkg-config --modversion kscreen)" = "%{version}" %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %files %doc COPYING %{_kde4_libdir}/libkscreen.so.1* @@ -68,6 +72,9 @@ test "$(pkg-config --modversion kscreen)" = "%{version}" %changelog +* Fri Oct 31 2014 Rex Dieter 1.0.5-1 +- 1.0.5 + * Sun Aug 17 2014 Fedora Release Engineering - 1:1.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 5cfecad..c37a9d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -802ba357e1e802d6773405bc54b47145 libkscreen-1.0.4.tar.xz +b1cc2805cd5ff468d534d75cbab69426 libkscreen-1.0.5.tar.xz