packages: spice/spice.spec - changes made by Remigiusz Marcinkiewicz <enlet...

[megabajt]

Author: megabajt                     Date: Mon Dec 28 23:55:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- changes made by Remigiusz Marcinkiewicz <enleth at enleth.com>
  - added -gcc-4.1.patch
  - switched to modular xorg deps
  - release 5

---- Files affected:
packages/spice:
   spice.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/spice/spice.spec
diff -u packages/spice/spice.spec:1.16 packages/spice/spice.spec:1.17
--- packages/spice/spice.spec:1.16	Mon Feb 12 23:09:15 2007
+++ packages/spice/spice.spec	Tue Dec 29 00:55:24 2009
@@ -5,14 +5,16 @@
 Summary(pt_BR.UTF-8):	SPICE simulador de circuitos
 Name:		spice
 Version:	3f5sfix
-Release:	4
+Release:	5
 License:	BSD
 Group:		Applications/Math
 Source0:	http://www.ibiblio.org/pub/Linux/apps/circuits/%{name}%{version}.tar.gz
 # Source0-md5:	b4a86690d2d56db3045a27ff75245356
-BuildRequires:	XFree86-devel
+Patch0:		%{name}-gcc-4.1.patch
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXaw-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -75,14 +77,15 @@
 
 %prep
 %setup -q -n %{name}%{version}
+%patch0 -p1
 
 %build
 ./util/build linux \
-	CC_OPT="%{rpmcflags}" \
+	CC_OPT="-I/usr/include/X11/ -I/usr/include/X11/Xaw/ %{rpmcflags}" \
 	LDFLAGS="-ltinfo -lm %{rpmldflags}" \
 	S_SPICE_EXEC_DIR="%{_libdir}/spice/" \
 	S_SPICE_LIB_DIR="%{_datadir}/spice/" \
-	LIBX="-L/usr/X11R6/%{_lib} -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11"
+	LIBX="-lXaw -lX11"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,9 +110,9 @@
 %defattr(644,root,root,755)
 %doc readme readme.Linux Linux.changes notes/{spice2,internal}
 %doc 3f5patches/README*
-%attr(0755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/spice
-%attr(0755,root,root) %{_libdir}/spice/*
+%attr(755,root,root) %{_libdir}/spice/*
 %{_datadir}/spice
 %{_mandir}/man1/*
 
@@ -119,6 +122,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2009/12/28 23:55:24  megabajt
+- changes made by Remigiusz Marcinkiewicz <enleth at enleth.com>
+  - added -gcc-4.1.patch
+  - switched to modular xorg deps
+  - release 5
+
 Revision 1.16  2007/02/12 22:09:15  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice/spice.spec?r1=1.16&r2=1.17&f=u