Author: lisu Date: Tue May 31 07:07:33 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- build and install gadgets
---- Files affected:
packages/dzen2:
dzen2.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/dzen2/dzen2.spec
diff -u packages/dzen2/dzen2.spec:1.2 packages/dzen2/dzen2.spec:1.3
--- packages/dzen2/dzen2.spec:1.2 Mon May 30 09:28:22 2011
+++ packages/dzen2/dzen2.spec Tue May 31 09:07:28 2011
@@ -29,7 +29,14 @@
CC="%{__cc}" \
OPTFLAGS="%{rpmcflags}" \
PLD_LDFLAGS="%{rpmldflags}" \
- PREFIX="%{_prefix}"
+ PREFIX="%{_prefix}" \
+ LIBDIR="%{_libdir}"
+
+%{__make} -C gadgets \
+ CC="%{__cc}" \
+ OPTFLAGS="%{rpmcflags}" \
+ PLD_LDFLAGS="%{rpmldflags}" \
+ LIBDIR="%{_libdir}"
%install
rm -rf $RPM_BUILD_ROOT
@@ -38,6 +45,16 @@
DESTDIR=$RPM_BUILD_ROOT \
PREFIX="%{_prefix}"
+%{__make} -C gadgets install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ PREFIX="%{_prefix}"
+
+# append dzen2- prefix to binaries
+for gadget in dbar gcpubar gdbar textwidth
+do
+mv $RPM_BUILD_ROOT%{_bindir}/{,dzen2-}"${gadget}"
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -45,6 +62,10 @@
%defattr(644,root,root,755)
%doc CREDITS README README.dzen gadgets/README.*
%attr(755,root,root) %{_bindir}/dzen2
+%attr(755,root,root) %{_bindir}/dzen2-dbar
+%attr(755,root,root) %{_bindir}/dzen2-gcpubar
+%attr(755,root,root) %{_bindir}/dzen2-gdbar
+%attr(755,root,root) %{_bindir}/dzen2-textwidth
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -52,6 +73,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2011/05/31 07:07:28 lisu
+- build and install gadgets
+
Revision 1.2 2011/05/30 07:28:22 lisu
- non integer rel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dzen2/dzen2.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
