packages: libxaw3dxft/libxaw3dxft.spec, libxaw3dxft/libxaw3dxft-pkgconfdir....

[baggins]

Author: baggins                      Date: Mon Feb 27 10:42:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix pkgconfdir properly

---- Files affected:
packages/libxaw3dxft:
   libxaw3dxft.spec (1.2 -> 1.3) , libxaw3dxft-pkgconfdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libxaw3dxft/libxaw3dxft.spec
diff -u packages/libxaw3dxft/libxaw3dxft.spec:1.2 packages/libxaw3dxft/libxaw3dxft.spec:1.3
--- packages/libxaw3dxft/libxaw3dxft.spec:1.2	Mon Feb 27 11:39:07 2012
+++ packages/libxaw3dxft/libxaw3dxft.spec	Mon Feb 27 11:42:46 2012
@@ -7,12 +7,13 @@
 #Summary(pl.UTF-8):	-
 Name:		libxaw3dxft
 Version:	1.3.3
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Libraries
 Source0:	http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
 # Source0-md5:	d0bafeae76f3e50dbdce3e91bd149697
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-pkgconfdir.patch
 URL:		http://sourceforge.net/projects/sf-xpaint/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -62,6 +63,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -80,8 +82,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT/usr/lib/pkgconfig $RPM_BUILD_ROOT%{_libdir}
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libXaw3dxft.la
 
 %clean
@@ -115,6 +115,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/02/27 10:42:46  baggins
+- rel 2
+- fix pkgconfdir properly
+
 Revision 1.2  2012/02/27 10:39:07  baggins
 - rel 1
 

================================================================
Index: packages/libxaw3dxft/libxaw3dxft-pkgconfdir.patch
diff -u /dev/null packages/libxaw3dxft/libxaw3dxft-pkgconfdir.patch:1.1
--- /dev/null	Mon Feb 27 11:42:51 2012
+++ packages/libxaw3dxft/libxaw3dxft-pkgconfdir.patch	Mon Feb 27 11:42:46 2012
@@ -0,0 +1,14 @@
+--- libxaw3dxft-1.3.3/Makefile.am~	2012-02-27 11:36:25.248340970 +0100
++++ libxaw3dxft-1.3.3/Makefile.am	2012-02-27 11:41:34.505021589 +0100
+@@ -68,9 +68,9 @@
+ 	-rmdir X11
+ 
+ install-exec-hook:
+-	-mkdir -p $(DESTDIR)/usr/lib/pkgconfig
++	-mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ 	cat libxaw3dxft.pc.in | sed -e "/VERSION/s//$(VERSION)/" > libxaw3dxft.pc
+-	/bin/cp -p libxaw3dxft.pc $(DESTDIR)/usr/lib/pkgconfig
++	/bin/cp -p libxaw3dxft.pc $(DESTDIR)$(libdir)/pkgconfig
+ 	rm -f libxaw3dxft.pc
+ 
+ # -version-info current:revision:age
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxaw3dxft/libxaw3dxft.spec?r1=1.2&r2=1.3&f=u