[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] SVN commit in packages r7262 - releases/2.1-CURRENT/xpm/SPECS
From:       cvsrep () annvix ! org
Date:       2007-04-26 6:14:41
Message-ID: E1HgxFZ-000756-EQ () ares ! annvix ! ca
[Download RAW message or body]

Author: vdanen
Date: 2007-04-26 00:14:41 -0600 (Thu, 26 Apr 2007)
New Revision: 7262

Modified:
   releases/2.1-CURRENT/xpm/SPECS/xpm.spec
Log:
- rebuild against new libx11 and (many) friends


Modified: releases/2.1-CURRENT/xpm/SPECS/xpm.spec
===================================================================
--- releases/2.1-CURRENT/xpm/SPECS/xpm.spec	2007-04-26 05:43:10 UTC (rev 7261)
+++ releases/2.1-CURRENT/xpm/SPECS/xpm.spec	2007-04-26 06:14:41 UTC (rev 7262)
@@ -12,7 +12,6 @@
 %define version		3.4k
 %define release		%_revrel
 
-%define prefix		/usr/X11R6
 %define	major		4
 %define	LIBVER		4.11
 %define libname		%mklibname %{name} %{major}
@@ -39,7 +38,10 @@
 Patch8:		xpm-3.4k-avx-norman.patch
 
 BuildRoot:	%{_buildroot}/%{name}-%{version}
-BuildRequires:	X11-devel
+BuildRequires:	imake
+BuildRequires:	libx11-devel
+BuildRequires:	libxt-devel
+BuildRequires:	libxext-devel
 
 %description
 The xpm package contains the XPM pixmap library for the X Window
@@ -100,9 +102,6 @@
 xmkmf
 make Makefiles
 
-# we have to patch the Makefiles after they're made
-cat %{_sourcedir}/xpm-3.4k-avx-norman.patch | patch -p1
-
 mkdir -p exports/include/X11
 cp lib/*.h exports/include/X11
 # %%make doesn't work on more than 2 cpu
@@ -112,7 +111,7 @@
 %install
 [ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-ln -sf libXpm.so.%{LIBVER} %{buildroot}%{prefix}/%{_lib}/libXpm.so
+#ln -sf libXpm.so.%{LIBVER} %{buildroot}%{prefix}/%{_lib}/libXpm.so
 
 
 %clean
@@ -125,14 +124,13 @@
 
 %files -n %{libname}
 %defattr(-,root,root)
-%{prefix}/%{_lib}/libXpm.so.*
+%{_libdir}/libXpm.so.*
 
 %files -n %{libname}-devel
 %defattr(-,root,root)
-%{prefix}/bin/*
-%{prefix}/include/X11/*
-%{prefix}/%{_lib}/libXpm.a
-%{prefix}/%{_lib}/libXpm.so
+%{_bindir}/*
+%{_includedir}/X11/*
+%{_libdir}/libXpm.so
 
 %files doc
 %defattr(-,root,root)
@@ -141,6 +139,9 @@
 
 
 %changelog
+* Thu Apr 26 2007 Vincent Danen <vdanen-at-build.annvix.org> 3.4k
+- rebuild against new libx11 and (many) friends
+
 * Wed Apr 25 2007 Vincent Danen <vdanen-at-build.annvix.org> 3.4k
 - rebuild (needed to build php-gd)
 - clean some provides and obsoletes


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs

[prev in list] [next in list] [prev in thread] [next in thread]