[qtcurve-kde4] update to 1.8.12

Rex Dieter rdieter at fedoraproject.org
Sat Jun 16 17:04:24 UTC 2012


commit b3c91c092e2e6cc4ebd04fd59ec9b0842979a9a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jun 16 12:03:12 2012 -0500

    update to 1.8.12

 .gitignore        |    2 +-
 qtcurve-kde4.spec |   21 +++++++++------------
 sources           |    2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a033af..53bce92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/QtCurve-KDE4-1.8.4.tar.bz2
 /QtCurve-KDE4-1.8.11.tar.bz2
+/QtCurve-KDE4-1.8.12.tar.bz2
diff --git a/qtcurve-kde4.spec b/qtcurve-kde4.spec
index 0b2f303..b8b96e6 100644
--- a/qtcurve-kde4.spec
+++ b/qtcurve-kde4.spec
@@ -1,5 +1,5 @@
 Name:		qtcurve-kde4
-Version:	1.8.11
+Version:	1.8.12
 Release:	1%{?dist}
 Summary:	This is a set of widget styles for Qt4/KDE4 based apps
 
@@ -12,11 +12,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	kdebase-workspace-devel
 BuildRequires:	gettext
 
-Requires:	kdebase-workspace
-
-%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
-
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+Requires:	kdebase-workspace%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
@@ -24,14 +20,11 @@ allowing users to achieve a uniform look between these widget toolkits.
 
 %prep
 %setup -q -n QtCurve-KDE4-%{version}
-## Due to the name change this sed is needed for find-lang.
-sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-## Build qtcurve-kde4 with xbar support
-%{cmake_kde4} .. -DQTC_XBAR_SUPPORT=true
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -39,12 +32,13 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-%find_lang %{name}
+# may want to consider patching catalog name in case of possible conflicts -- rex
+%find_lang qtcurve 
 
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}.lang
+%files -f qtcurve.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO COPYING ChangeLog
 %{_kde4_appsdir}/QtCurve/
@@ -59,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jun 16 2012 Rex Dieter <rdieter at fedoraproject.org> 1.8.12-1
+- update to 1.8.12
+
 * Wed Feb 29 2012 Jaroslav Reznik <jreznik at redhat.com> - 1.8.11-1
 - update to 1.8.11
 
diff --git a/sources b/sources
index 6bc14f8..45111d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62dde2f3a2fabf2a209b07c2cf2b9c13  QtCurve-KDE4-1.8.11.tar.bz2
+8a08d28204fab1b3db6813519f174014  QtCurve-KDE4-1.8.12.tar.bz2


More information about the scm-commits mailing list