packages: kde4-koffice/kde4-koffice.spec - patch0 applied with -p1 - adjust...

shadzik shadzik at pld-linux.org
Tue Jan 4 19:37:31 CET 2011


Author: shadzik                      Date: Tue Jan  4 18:37:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch0 applied with -p1
- adjusted to new %cmake macro

---- Files affected:
packages/kde4-koffice:
   kde4-koffice.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: packages/kde4-koffice/kde4-koffice.spec
diff -u packages/kde4-koffice/kde4-koffice.spec:1.94 packages/kde4-koffice/kde4-koffice.spec:1.95
--- packages/kde4-koffice/kde4-koffice.spec:1.94	Tue Jan  4 19:33:00 2011
+++ packages/kde4-koffice/kde4-koffice.spec	Tue Jan  4 19:37:25 2011
@@ -73,7 +73,7 @@
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.129
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	soprano-devel
 BuildRequires:	sqlite3-devel >= 3.6.23
 BuildRequires:	wv2-devel >= 0.4.1
@@ -336,17 +336,12 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
-%patch0 -p0
+%patch0 -p1
 
 %build
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
 	../
 
 %{__make}
@@ -914,6 +909,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2011/01/04 18:37:25  shadzik
+- patch0 applied with -p1
+- adjusted to new %cmake macro
+
 Revision 1.94  2011/01/04 18:33:00  shadzik
 - 2.3.0
 - NFY, rel 0.1, libwpg/libwpd patch on the way from fedora
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-koffice/kde4-koffice.spec?r1=1.94&r2=1.95&f=u



More information about the pld-cvs-commit mailing list