- build and install gadgets

Changed files:
    dzen2.spec -> 1.3

diff --git a/dzen2.spec b/dzen2.spec
index 0f0143935c9444b28e7a012061dfb4260c1728dc..b3fe932dd44f0f73a96d2ef89217d313d646352c 100644 (file)
--- a/dzen2.spec
+++ b/dzen2.spec
@@ -28,7 +28,14 @@ it will work with any windowmanger.
        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
@@ -37,6 +44,16 @@ rm -rf $RPM_BUILD_ROOT
        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
 
@@ -44,3 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %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