packages: fox/fox.spec - cups bcond - moved man pages to proper packages

[qboosh]

Author: qboosh                       Date: Thu May 12 17:54:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cups bcond
- moved man pages to proper packages

---- Files affected:
packages/fox:
   fox.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: packages/fox/fox.spec
diff -u packages/fox/fox.spec:1.113 packages/fox/fox.spec:1.114
--- packages/fox/fox.spec:1.113	Sun Jan 30 17:48:32 2011
+++ packages/fox/fox.spec	Thu May 12 19:54:48 2011
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	cups		# CUPS support
 %bcond_without	static_libs	# don't build static libraries
 #
 Summary:	The FOX C++ GUI Toolkit
@@ -21,7 +22,7 @@
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bzip2-devel >= 1.0.2
-BuildRequires:	cups-devel
+%{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	doxygen
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.5
@@ -141,7 +142,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-cups \
+	%{?with_cups:--enable-cups} \
 	%{?debug:--enable-debug}%{!?debug:--enable-release} \
 	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
 	--with-opengl \
@@ -165,11 +166,11 @@
 
 ln -sf libFOX-1.7.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
-rm -f doc/Makefile* doc/*/Makefile*
-
 %{__make} -C tests clean
 cp -r tests/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%{__rm} doc/Makefile* doc/*/Makefile*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -179,20 +180,24 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE_ADDENDUM README
+%attr(755,root,root) %{_bindir}/ControlPanel
 %attr(755,root,root) %{_libdir}/libCHART-1.7.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libCHART-1.7.so.0
 %attr(755,root,root) %{_libdir}/libFOX-1.7.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libFOX-1.7.so.0
-%attr(755,root,root) %{_bindir}/ControlPanel
+%{_mandir}/man1/ControlPanel.1*
 
 %files progs
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Adie.stx
+%attr(755,root,root) %{_bindir}/PathFinder
 %attr(755,root,root) %{_bindir}/adie
 %attr(755,root,root) %{_bindir}/calculator
-%attr(755,root,root) %{_bindir}/PathFinder
 %attr(755,root,root) %{_bindir}/shutterbug
-%attr(755,root,root) %{_bindir}/Adie.stx
-%{_mandir}/man1/*
+%{_mandir}/man1/PathFinder.1*
+%{_mandir}/man1/adie.1*
+%{_mandir}/man1/calculator.1*
+%{_mandir}/man1/shutterbug.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -206,6 +211,7 @@
 %{_libdir}/libFOX-1.7.la
 %{_includedir}/fox-1.7
 %{_pkgconfigdir}/fox.pc
+%{_mandir}/man1/reswrap.1*
 
 %if %{with static_libs}
 %files static
@@ -228,6 +234,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2011/05/12 17:54:48  qboosh
+- cups bcond
+- moved man pages to proper packages
+
 Revision 1.113  2011/01/30 16:48:32  sparky
 - BR/R: xorg-lib-libXi-devel
 - fixed linking
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fox/fox.spec?r1=1.113&r2=1.114&f=u