SPECS: kseg.spec - pass QTINCLUDE instead of qt_header patch - use...

darekr darekr at pld-linux.org
Sat Mar 31 15:53:15 CEST 2007


Author: darekr                       Date: Sat Mar 31 13:53:15 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pass QTINCLUDE instead of qt_header patch
- use __cxx, kill _applnkdir
- added -headerfile patch
- it doesn't still build

---- Files affected:
SPECS:
   kseg.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/kseg.spec
diff -u SPECS/kseg.spec:1.10 SPECS/kseg.spec:1.11
--- SPECS/kseg.spec:1.10	Tue Feb 13 07:46:49 2007
+++ SPECS/kseg.spec	Sat Mar 31 15:53:10 2007
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO: 
-#	- kill _applnkdir
 #	- fix build
 Summary:	KSEG is a free interactive geometry system
 Summary(pl.UTF-8):	KSEG jest darmowym interaktywnym systemem geometrycznym
@@ -13,7 +12,7 @@
 # Source0-md5:	b7302130aa57f0707402340cbf0c7070
 Source1:	%{name}.desktop
 Patch0:		%{name}-DEBIAN.patch
-Patch1:		%{name}-qt_headers.patch
+Patch1:		%{name}-headerfile.patch
 URL:		http://www.mit.edu/~ibaran/kseg.html
 BuildRequires:	qt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,14 +40,16 @@
 
 %build
 %{__make} \
-	QTDIR=%{_prefix}/ \
+	QTDIR=%{_prefix} \
 	CCFLAGS="%{rpmcflags} -c -fno-rtti -fno-exceptions" \
-	CC="%{__cc}"
+	CC="%{__cxx}" \
+	QTINCLUDE="-I/usr/include/qt"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D kseg $RPM_BUILD_ROOT{%{_bindir}/kseg,%{_applnkdir}/Scientific/Mathematics}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Mathematics/%{name}.desktop
+install -D kseg $RPM_BUILD_ROOT{%{_bindir}/kseg,%{_desktopdir}}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,7 +58,7 @@
 %defattr(644,root,root,755)
 %doc README* AUTHORS* ChangeLog*
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Scientific/Mathematics/*
+%{_desktopdir}/kseg.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +66,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/03/31 13:53:10  darekr
+- pass QTINCLUDE instead of qt_header patch
+- use __cxx, kill _applnkdir
+- added -headerfile patch
+- it doesn't still build
+
 Revision 1.10  2007/02/13 06:46:49  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kseg.spec?r1=1.10&r2=1.11&f=u



More information about the pld-cvs-commit mailing list