packages: WindowMaker/WindowMaker.spec - BR: xorg-lib-libXinerama-devel, re...

gotar gotar at pld-linux.org
Sat May 21 00:33:40 CEST 2011


Author: gotar                        Date: Fri May 20 22:33:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: xorg-lib-libXinerama-devel, removed *.la, try make -j1 (x86_64)

---- Files affected:
packages/WindowMaker:
   WindowMaker.spec (1.193 -> 1.194) 

---- Diffs:

================================================================
Index: packages/WindowMaker/WindowMaker.spec
diff -u packages/WindowMaker/WindowMaker.spec:1.193 packages/WindowMaker/WindowMaker.spec:1.194
--- packages/WindowMaker/WindowMaker.spec:1.193	Fri May 20 21:17:19 2011
+++ packages/WindowMaker/WindowMaker.spec	Sat May 21 00:33:35 2011
@@ -50,6 +50,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXpm-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	Esetroot
@@ -245,7 +246,7 @@
 	%{__sed} -i s,%{_prefix}/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
-mv -f po/{no,nb}.po
+%{__mv} po/{no,nb}.po
 
 %build
 #%ifarch %{x8664}
@@ -286,7 +287,7 @@
 
 touch WindowMaker/Defaults/W*.in
 
-%{__make} \
+%{__make} -j1 \
 	CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
@@ -317,10 +318,11 @@
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 #%{__sed} s, at LIBDIR@,%{_libdir}, %{SOURCE6} > $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
-
 %{__make} -C %{name}-extra-%{extraver} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %find_lang %{name} --all-name
 
 %clean
@@ -336,29 +338,21 @@
 %dir %{_sysconfdir}/WindowMaker
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/WindowMaker/*
 
-%{_mandir}/man1/*
-%lang(sk) %{_mandir}/sk/man1/*
+%{_mandir}/man1/*.1*
+%lang(sk) %{_mandir}/sk/man1/*.1*
 
-%{_pixmapsdir}/*
+%{_pixmapsdir}/*.xpm
 %{_wmpropsdir}/WindowMaker.desktop
 
 %attr(755,root,root) %{_bindir}/convertfonts
 %attr(755,root,root) %{_bindir}/bughint
 %attr(755,root,root) %{_bindir}/geticonset
 %attr(755,root,root) %{_bindir}/getstyle
-%attr(755,root,root) %{_bindir}/seticons
-%attr(755,root,root) %{_bindir}/setstyle
-%attr(755,root,root) %{_bindir}/wdwrite
-%attr(755,root,root) %{_bindir}/wdread
+%attr(755,root,root) %{_bindir}/set*
+%attr(755,root,root) %{_bindir}/wd*
 %attr(755,root,root) %{_bindir}/wkdemenu.pl
-%attr(755,root,root) %{_bindir}/wm-oldmenu2new
-%attr(755,root,root) %{_bindir}/wmagnify
-%attr(755,root,root) %{_bindir}/wmaker
-%attr(755,root,root) %{_bindir}/wmaker.inst
-%attr(755,root,root) %{_bindir}/wmsetbg
-%attr(755,root,root) %{_bindir}/wmsetup
-%attr(755,root,root) %{_bindir}/wxcopy
-%attr(755,root,root) %{_bindir}/wxpaste
+%attr(755,root,root) %{_bindir}/wm*
+%attr(755,root,root) %{_bindir}/wx*
 %attr(755,root,root) %{_bindir}/dockit
 
 %{_datadir}/WindowMaker
@@ -391,7 +385,6 @@
 %attr(755,root,root) %{_bindir}/get-wraster-flags
 %attr(755,root,root) %{_bindir}/get-wutil-flags
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %{_includedir}/*
 %{_pkgconfigdir}/*.pc
 
@@ -405,6 +398,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.194  2011/05/20 22:33:35  gotar
+- BR: xorg-lib-libXinerama-devel, removed *.la, try make -j1 (x86_64)
+
 Revision 1.193  2011/05/20 19:17:19  gotar
 - enable xinerama
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/WindowMaker/WindowMaker.spec?r1=1.193&r2=1.194&f=u



More information about the pld-cvs-commit mailing list