rpms/attica/devel attica-0.1.2-pkgconfig.patch, NONE, 1.1 attica.spec, 1.4, 1.5

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/attica/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25209

Modified Files:
	attica.spec 
Added Files:
	attica-0.1.2-pkgconfig.patch 
Log Message:
* Thu Jan 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.1.2-1
- attica-0.1.2
- patch Version in libattica.pc
- %build: %_cmake_skip_rpath 


attica-0.1.2-pkgconfig.patch:
 libattica.pc.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE attica-0.1.2-pkgconfig.patch ---
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
 


Index: attica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/attica.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- attica.spec	16 Jan 2010 21:01:54 -0000	1.4
+++ attica.spec	9 Feb 2010 21:12:07 -0000	1.5
@@ -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 <rdieter at fedoraproject.org> - 0.1.2-1
 - attica-0.1.2
+- patch Version in libattica.pc
+- %%build: %%_cmake_skip_rpath 
 
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
 - attica-0.1.1