[libkscreen] 1:1.0.2-2

Rex Dieter rdieter at fedoraproject.org
Mon Nov 25 14:04:52 UTC 2013


commit d1abe704594a0cbc1f4da92143f099d3777249c1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Nov 25 08:04:44 2013 -0600

    1:1.0.2-2
    
    - backport pkgconfig fix (verify in %check)
    - track soname
    - fix changelog date

 0001-fix-pkgconfig-Version.patch |   25 +++++++++++++++++++++++++
 libkscreen.spec                  |   21 ++++++++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)
---
diff --git a/0001-fix-pkgconfig-Version.patch b/0001-fix-pkgconfig-Version.patch
new file mode 100644
index 0000000..0428f36
--- /dev/null
+++ b/0001-fix-pkgconfig-Version.patch
@@ -0,0 +1,25 @@
+From f45dc4a373acf9ed5fed905df6deb709506d27e2 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Mon, 25 Nov 2013 07:54:55 -0600
+Subject: [PATCH] fix pkgconfig Version:
+
+---
+ src/kscreen.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kscreen.pc.in b/src/kscreen.pc.in
+index 6f4bb39..2687d2e 100644
+--- a/src/kscreen.pc.in
++++ b/src/kscreen.pc.in
+@@ -4,7 +4,7 @@ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: kscreen
+ Description: Qt Based library to manage screens with backends (xrandr, whatevercomesnext)
+-Version: @VERSION@
++Version: @libkscreen_VERSION@
+ 
+ Libs: -L${libdir} -lkscreen
+ Cflags: -I${includedir}
+-- 
+1.8.4.2
+
diff --git a/libkscreen.spec b/libkscreen.spec
index 3c7f2c6..6d2070f 100644
--- a/libkscreen.spec
+++ b/libkscreen.spec
@@ -1,7 +1,7 @@
 Name:           libkscreen
 Epoch:          1
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Display configuration library
 
 License:        GPLv2+
@@ -9,6 +9,9 @@ URL:            https://projects.kde.org/projects/playground/libs/libkscreen
 
 Source0:        http://download.kde.org/stable/libkscreen/%{version}/src/libkscreen-%{version}.tar.xz
 
+## upstream patches
+Patch0001: 0001-fix-pkgconfig-Version.patch
+
 BuildRequires:  kdelibs4-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  qjson-devel >= 0.8.1
@@ -29,6 +32,8 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
+%patch0001 -p1 -b .0001
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -41,6 +46,11 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%check
+# verify pkgconfig version
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion kscreen)" = "%{version}"
+
 
 %post -p /sbin/ldconfig
 
@@ -49,7 +59,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %files
 %doc COPYING
-%{_kde4_libdir}/libkscreen.so.*
+%{_kde4_libdir}/libkscreen.so.1*
 %{_kde4_libdir}/kde4/plugins/kscreen/
 
 %files devel
@@ -60,6 +70,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Nov 25 2013 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.2-2
+- backport pkgconfig fix (verify in %%check)
+- track soname
+- fix changelog date
+
 * Wed Nov 20 2013 Dan Vrátil <dvratil at redhat.com> - 1:1.0.2-1
  - libkscreen 1.0.2
 
@@ -72,7 +87,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 * Thu May 02 2013 Dan Vrátil <dvratil at redhat.com> - 1:0.0.92-1
  - libkscreen 0.0.92
 
-* Thu Apr 23 2013 Dan Vrátil <dvratil at redhat.com> - 1:0.0.82.git20130423-1
+* Tue Apr 23 2013 Dan Vrátil <dvratil at redhat.com> - 1:0.0.82.git20130423-1
  - dev git build
 
 * Wed Mar 27 2013 Dan Vrátil <dvratil at redhat.com> - 1:0.0.81-1


More information about the scm-commits mailing list