From ce9532b748eb6daa6e439afdb9d48e744b565f84 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 09 2010 21:12:07 +0000 Subject: - attica-0.1.2 - patch Version in libattica.pc - %build: %_cmake_skip_rpath --- 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..f349b1d 100644 --- a/attica.spec +++ b/attica.spec @@ -1,7 +1,7 @@ Name: attica Version: 0.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementation of the Open Collaboration Services API Group: Development/Libraries @@ -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) +## upstreamable patches +# fix Version in libattica.pc +Patch50: attica-0.1.2-pkgconfig.patch + BuildRequires: cmake BuildRequires: qt4-devel BuildRequires: openssl-devel @@ -32,11 +36,15 @@ developing applications that use %{name}. %prep %setup -q +%patch50 -p1 -b .pkgconfig + %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake} .. +%{cmake} \ + %{?_cmake_skip_rpath} \ + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -71,6 +79,8 @@ rm -rf %{buildroot} %changelog * 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