From 4cc37941b8e5e011ebed66c337ae37f7385740da Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 17 2010 12:53:12 +0000 Subject: - attica-0.1.3 --- diff --git a/.cvsignore b/.cvsignore index e1c4451..16aecf9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -attica-0.1.2.tar.bz2 +attica-0.1.3.tar.bz2 diff --git a/attica-0.1.2-pkgconfig.patch b/attica-0.1.2-pkgconfig.patch new file mode 100644 index 0000000..529b8b1 --- /dev/null +++ b/attica-0.1.2-pkgconfig.patch @@ -0,0 +1,12 @@ +diff -up attica-0.1.2/lib/cmake/libattica.pc.cmake.pkgconfig attica-0.1.2/lib/cmake/libattica.pc.cmake +--- attica-0.1.2/lib/cmake/libattica.pc.cmake.pkgconfig 2010-01-14 07:00:16.000000000 -0600 ++++ attica-0.1.2/lib/cmake/libattica.pc.cmake 2010-02-09 15:06:28.501736013 -0600 +@@ -6,7 +6,7 @@ includedir=${CMAKE_INSTALL_PREFIX}/inclu + Name: libattica + Description: Qt library to access Open Collaboration Services + #Requires: +-Version: ${ATTICA_VERSION_MAJOR}.${ATTICA_VERSION_MINOR}.${ATTICA_VERSION_PATCH} ++Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH} + Libs: -L${LIB_DESTINATION} -lattica + Cflags: -I${CMAKE_INSTALL_PREFIX}/include + diff --git a/attica.spec b/attica.spec index d8686c3..cbd82e7 100644 --- a/attica.spec +++ b/attica.spec @@ -1,6 +1,6 @@ Name: attica -Version: 0.1.2 +Version: 0.1.3 Release: 1%{?dist} Summary: Implementation of the Open Collaboration Services API @@ -10,6 +10,10 @@ URL: http://www.kde.org Source0: ftp://ftp.kde.org/pub/kde/stable/attica/attica-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## upstream patches +# fix Version in libattica.pc +Patch100: attica-0.1.2-pkgconfig.patch + BuildRequires: cmake BuildRequires: qt4-devel BuildRequires: openssl-devel @@ -18,7 +22,6 @@ BuildRequires: openssl-devel Attica is a Qt library that implements the Open Collaboration Services API version 1.4. - %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -32,11 +35,15 @@ developing applications that use %{name}. %prep %setup -q +%patch100 -p1 -b .pkgconfig + %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake} .. +%{cmake} \ + %{?_cmake_skip_rpath} \ + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -69,8 +76,13 @@ rm -rf %{buildroot} %changelog +* Wed Apr 07 2010 Rex Dieter - 0.1.3-1 +- attica-0.1.3 + * Thu Jan 14 2010 Rex Dieter - 0.1.2-1 - attica-0.1.2 +- patch Version in libattica.pc +- %%build: %%_cmake_skip_rpath * Fri Dec 18 2009 Rex Dieter - 0.1.1-1 - attica-0.1.1 diff --git a/sources b/sources index 9f9f21f..f024a19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b4207dbc0a826d422632bdb9c50d51a attica-0.1.2.tar.bz2 +aeb0c14d1bf2afa7d9ce3b5a16390a03 attica-0.1.3.tar.bz2