- fixed new bconds, cleanups/unifications, BR: autoconf

[packages/distcc.git] / distcc.spec

diff --git a/distcc.spec b/distcc.spec
index 97afe519682444ab8e0b64e947df2f8e977e234a..11b6558ca1c865bfcfaf269ca59f97f3c915e70c 100644 (file)
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,27 +1,28 @@
 #
 # Conditional build:
-# _without_gtk build without gtk2(monitor) support
+%bcond_with    gnome   # build without gnome(monitor) support
 #
 Summary:       Program to distribute compilation of C or C++
 Summary(pl):   Program do rozdzielania kompilacji programów w C lub C++
 Name:          distcc
 Group:         Development/Languages
-Version:       2.10.1
-Release:       1
+Version:       2.11
+Release:       2
 License:       GPL
-URL:           http://distcc.samba.org/
 Source0:       http://distcc.samba.org/ftp/distcc/%{name}-%{version}.tar.bz2
-# Source0-md5: 7eeccb1a68d52c02bd96864e532e0870
+# Source0-md5: f3458779c13255d88ee89ea7ccddda29
 Source1:       %{name}.inetd
 Source2:       %{name}.init
 Source3:       %{name}.sh
 Source4:       %{name}.csh
 Source5:       %{name}.config
+Source6:       %{name}.logrotate
 Patch0:                %{name}-user.patch
-%{!?_without_gtk:BuildRequires:        gtk+2-devel >= 2.0}
-BuildRequires: popt-devel
+URL:           http://distcc.samba.org/
+BuildRequires: autoconf
+%{?with_gtk:BuildRequires:     libgnome-devel >= 2.0}
 BuildRequires: pkgconfig
-BuildRequires: freetype-devel
+BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,7 +57,6 @@ na kilka maszyn w sieci. distcc powinien zawsze generowa
 rezultaty jak lokalna kompilacja, jest prosty w instalacji i u¿yciu
 oraz bardzo czêsto dwa lub wiêcej razy szybszy ni¿ lokalna kompilacja.
 
-
 %package inetd
 Summary:       inetd configs for distcc
 Summary(pl):   Pliki konfiguracyjne do u¿ycia distcc poprzez inetd
@@ -72,7 +72,7 @@ distcc configs for running from inetd.
 Pliki konfiguracyjna distcc do startowania demona poprzez inetd.
 
 %package standalone
-Summary:       standalone daemon configs for distcc
+Summary:       Standalone daemon configs for distcc
 Summary(pl):   Pliki konfiguracyjne do startowania distcc w trybie standalone
 Group:         Daemons
 PreReq:                %{name}-common = %{version}
@@ -87,21 +87,45 @@ distcc configs for running as a standalone daemon.
 Pliki konfiguracyjne distcc do startowania demona w trybie
 standalone.
 
+%package monitor
+Summary:        Monitor for distcc
+Summary(pl):    Monitor dla distcc
+Group:          Applications
+
+%description monitor
+Monitor for distcc.
+
+%description monitor -l pl
+Monitor dla distcc.
+
+%package monitor-gnome
+Summary:        gtk monitor for distcc
+Summary(pl):    Monitor gtk dla distcc
+Group:          X11/Applications
+
+%description monitor-gnome
+gtk monitor for distcc.
+
+%description monitor-gnome -l pl
+Monitor gtk dla distcc.
+
 %prep
 %setup -q
 %patch -p1
 
 %build
+%{__autoconf}
+%{__autoheader}
 %configure \
-       %{!?_without_gtk:--enable-gnome}
+       %{?with_gnome:--with-gnome}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd \
-          $RPM_BUILD_ROOT/etc/rc.d/init.d \
-          $RPM_BUILD_ROOT/etc/profile.d
+install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d,profile.d,logrotate.d} \
+       $RPM_BUILD_ROOT%{_applnkdir}/Network/Misc $RPM_BUILD_ROOT%{_pixmapsdir} \
+       $RPM_BUILD_ROOT%{_var}/log
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -110,6 +134,16 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/distccd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/distcc
 install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/profile.d
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/distccd
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/distccd
+
+%if %{with gnome}
+mv $RPM_BUILD_ROOT%{_datadir}/distccmon-gnome.desktop \
+       $RPM_BUILD_ROOT%{_applnkdir}/Network/Misc
+mv $RPM_BUILD_ROOT%{_datadir}/distccmon-gnome-icon.png \
+       $RPM_BUILD_ROOT%{_pixmapsdir}
+%endif
+
+touch $RPM_BUILD_ROOT%{_var}/log/distcc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -142,16 +176,34 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del distcc
 fi
 
-%files common
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README *.txt
+%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man?/%{name}.*
+/etc/profile.d/*sh
+
+%files common
+%defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/distccd
-%attr(755,root,root) %{_bindir}/*
-%attr(644,root,root) %{_mandir}/man?/*
-%attr(644,root,root) /etc/profile.d/*sh
+%attr(640,root,root) %ghost %{_var}/log/distcc
+%attr(640,root,root) /etc/logrotate.d/distccd
+%attr(755,root,root) %{_bindir}/%{name}d
+%{_mandir}/man?/%{name}d.*
 
 %files inetd
+%defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/distccd
 
 %files standalone
+%defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/distcc
+
+%files monitor
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/distccmon-text
+%if %{with gnome}
+%attr(755,root,root) %{_bindir}/distccmon-gnome
+%{_applnkdir}/Network/Misc/*.desktop
+%{_pixmapsdir}/*
+%endif