packages: akonadi-googledata/akonadi-googledata.spec - update cmake macro

glen glen at pld-linux.org
Sat Mar 12 19:44:45 CET 2011


Author: glen                         Date: Sat Mar 12 18:44:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update cmake macro

---- Files affected:
packages/akonadi-googledata:
   akonadi-googledata.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/akonadi-googledata/akonadi-googledata.spec
diff -u packages/akonadi-googledata/akonadi-googledata.spec:1.3 packages/akonadi-googledata/akonadi-googledata.spec:1.4
--- packages/akonadi-googledata/akonadi-googledata.spec:1.3	Tue Sep 28 21:18:14 2010
+++ packages/akonadi-googledata/akonadi-googledata.spec	Sat Mar 12 19:44:39 2011
@@ -12,6 +12,7 @@
 BuildRequires:	akonadi-devel
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.6.2
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	libgcal-devel
 BuildRequires:	libxslt-progs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,18 +33,13 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
--DMYSQLD_EXECUTABLE=%{_sbindir}/mysqld \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
+	-DMYSQLD_EXECUTABLE=%{_sbindir}/mysqld \
 	..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -58,8 +54,6 @@
 %attr(755,root,root) %{_bindir}/akonadi_googledata_resource
 %{_datadir}/akonadi/agents/gcalresource.desktop
 %{_datadir}/akonadi/agents/googledataresource.desktop
-# %{_datadir}/locale/zh_TW/LC_MESSAGES/akonadi_gcal_resource.mo # FIXME consider using %find_lang
-
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/03/12 18:44:39  glen
+- update cmake macro
+
 Revision 1.3  2010/09/28 19:18:14  vip
 - updated desc, BR's, rel 1
 
@@ -75,4 +72,3 @@
 
 Revision 1.1  2010/09/27 12:45:26  vip
 - new, draft, feel free to edit
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/akonadi-googledata/akonadi-googledata.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list