SPECS: ddccontrol.spec - added gnome patch and gtk, gnome bconds - ...

[qboosh]

Author: qboosh                       Date: Tue May 16 18:21:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added gnome patch and gtk,gnome bconds
- separated gddccontrol tool to -gtk subpackage
- more desc, deps and files cleanups

---- Files affected:
SPECS:
   ddccontrol.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/ddccontrol.spec
diff -u SPECS/ddccontrol.spec:1.8 SPECS/ddccontrol.spec:1.9
--- SPECS/ddccontrol.spec:1.8	Tue May 16 19:25:34 2006
+++ SPECS/ddccontrol.spec	Tue May 16 20:21:11 2006
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	gnome	# don't build gnome applet
+%bcond_without	gtk	# don't build GTK+ GUI
+#
 %define dbversion 20060308
 %define ddcdb	%{name}-db-%{dbversion}
 
@@ -7,7 +12,7 @@
 Name:		ddccontrol
 Version:	0.4.1
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		Applications
 Source0:	http://dl.sourceforge.net/ddccontrol/%{name}-%{version}.tar.bz2
 # Source0-md5:	bef6825f7dfffbb4fd40eb4a848cd438
@@ -15,15 +20,17 @@
 # Source1-md5:	973a5db6081054bbb336254331820b0c
 Patch0:		%{name}-SAM0197.patch
 Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-gnome.patch
 URL:		http://ddccontrol.sourceforge.net/
-BuildRequires:	gtk+2-devel >= 2:2.4
-BuildRequires:	gnome-panel-devel
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
+%{?with_gnome:BuildRequires:	gnome-panel-devel >= 2.10}
+%{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.4}
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	pciutils-devel
+BuildRequires:	pkgconfig
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	libxml2
-Requires:	pciutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,10 +43,22 @@
 takich jak jaskrawość i kontrast, bez używania OSD i przycisków na
 obudowie monitora.
 
+%package gtk
+Summary:	GTK+ GUI for ddccontrol
+Summary(pl):	Graficzny interfejs GTK+ dla ddccontrol
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description gtk
+GTK+ GUI for ddccontrol.
+
+%description gtk -l pl
+Graficzny interfejs GTK+ dla ddccontrol.
+
 %package applet
 Summary:	GNOME applet for ddccontrol
 Summary(pl):	Aplet GNOME dla ddccontrol
-Group:		Applications
+Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 
 %description applet
@@ -49,48 +68,57 @@
 Aplet GNOME dla ddccontrol.
 
 %package libs
-Summary:	ddccontrol libraries
-Summary(pl):	Biblioteki ddccontrol
+Summary:	ddccontrol library
+Summary(pl):	Biblioteka ddccontrol
 Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
 
 %description libs
-DDCcontrol libraries.
+DDCcontrol library.
 
 %description libs -l pl
-Biblioteki DDCcontrol.
+Biblioteka DDCcontrol.
 
 %package devel
-Summary:	Development files for ddccontrol
-Summary(pl):	Pliki niezbędne programistom używającym ddccontrol
+Summary:	Development files for ddccontrol library
+Summary(pl):	Pliki niezbędne programistom używającym biblioteki ddccontrol
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	libxml2-devel
+Requires:	pciutils-devel
 
 %description devel
-Development files for ddccontrol libraries.
+Development files for ddccontrol library.
 
 %description devel -l pl
-Pliki niezbędne programistom używającym bibliotek ddccontrol.
+Pliki niezbędne programistom używającym biblioteki ddccontrol.
 
 %package static
-Summary:	Static ddccontrol libraries
-Summary(pl):	Biblioteki statyczne ddccontrol
+Summary:	Static ddccontrol library
+Summary(pl):	Biblioteka statyczna ddccontrol
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static ddccontrol libraries.
+Static ddccontrol library.
 
 %description static -l pl
-Biblioteki statyczne ddccontrol.
+Biblioteka statyczna ddccontrol.
 
 %prep
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%configure
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	%{!?with_gtk:--disable-gnome} \
+	%{!?with_gnome:--disable-gnome-applet}
 %{__make}
 cd %{ddcdb}
 %configure
@@ -104,42 +132,51 @@
 %{__make} -C %{ddcdb} install \
         DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README TODO doc/html
 %attr(755,root,root) %{_bindir}/ddccontrol
 %attr(755,root,root) %{_bindir}/ddcpci
-%attr(755,root,root) %{_bindir}/gddccontrol
-%{_desktopdir}/*
-%{_pixmapsdir}/*
 %{_datadir}/ddccontrol-db
 
+%if %{with gtk}
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gddccontrol
+%{_desktopdir}/gddccontrol.desktop
+%{_pixmapsdir}/gddccontrol.png
+%endif
+
+%if %{with gnome}
 %files applet
 %defattr(644,root,root,755)
 %dir %{_libdir}/ddccontrol
-%dir %{_datadir}/ddccontrol
 %attr(755,root,root) %{_libdir}/ddccontrol/ddcc-applet
-%{_datadir}/ddccontrol/*
+%{_datadir}/ddccontrol
 %{_libdir}/bonobo/servers/*
+%endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%attr(755,root,root) %{_libdir}/libddccontrol.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libddccontrol.so
+%{_libdir}/libddccontrol.la
+%{_includedir}/ddccontrol
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libddccontrol.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -147,6 +184,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/05/16 18:21:11  qboosh
+- added gnome patch and gtk,gnome bconds
+- separated gddccontrol tool to -gtk subpackage
+- more desc, deps and files cleanups
+
 Revision 1.8  2006/05/16 17:25:34  qboosh
 - pl cosmetics, desc cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ddccontrol.spec?r1=1.8&r2=1.9&f=u