SPECS (Titanium): soprano.spec - use %cc_version macro

glen glen at pld-linux.org
Wed Aug 6 01:32:32 CEST 2008


Author: glen                         Date: Tue Aug  5 23:32:32 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- use %cc_version macro

---- Files affected:
SPECS:
   soprano.spec (1.31.2.2 -> 1.31.2.3) 

---- Diffs:

================================================================
Index: SPECS/soprano.spec
diff -u SPECS/soprano.spec:1.31.2.2 SPECS/soprano.spec:1.31.2.3
--- SPECS/soprano.spec:1.31.2.2	Tue Aug  5 23:36:05 2008
+++ SPECS/soprano.spec	Wed Aug  6 01:32:27 2008
@@ -26,15 +26,13 @@
 BuildRequires:	QtTest-devel >= %{qtbrver}
 BuildRequires:	clucene-core-devel >= 0.9.16a-2
 BuildRequires:	cmake
-%if %{with sesame2}
-BuildRequires:	libgcj-devel
-%endif
+%{?with_sesame2:BuildRequires:	libgcj-devel}
 %{?with_serializer:BuildRequires:	libraptor-devel}
 BuildRequires:	qt4-build >= %{qtbrver}
 BuildRequires:	qt4-qmake >= %{qtbrver}
 BuildRequires:	rasqal-devel
 BuildRequires:	redland-devel >= 1.0.6
-BuildRequires:	rpmbuild(macros) >= 1.293
+BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,8 +77,8 @@
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
-	-DJAVA_INCLUDE_PATH=%{_libdir}/gcc/%{_target_platform}/%(%{__cc} -dumpversion)/include \
-	-DJAVA_JVM_LIBRARY=%{_libdir}/gcj-%(%{__cc} -dumpversion)/libjvm.so \
+	-DJAVA_INCLUDE_PATH=%{_libdir}/gcc/%{_target_platform}/%{cc_version}/include \
+	-DJAVA_JVM_LIBRARY=%{_libdir}/gcj-%{cc_version}/libjvm.so \
 	..
 
 %{__make}
@@ -142,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31.2.3  2008/08/05 23:32:27  glen
+- use %cc_version macro
+
 Revision 1.31.2.2  2008/08/05 21:36:05  shadzik
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/soprano.spec?r1=1.31.2.2&r2=1.31.2.3&f=u



More information about the pld-cvs-commit mailing list