SPECS: gpsd.spec - cleanups - sorted BR - disabled ldconfig in pos...

[abram]

Author: abram                        Date: Thu Dec  1 15:07:13 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups
- sorted BR
- disabled ldconfig in post and postun
- deleted files libgps.a and libgps.la

---- Files affected:
SPECS:
   gpsd.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/gpsd.spec
diff -u SPECS/gpsd.spec:1.1 SPECS/gpsd.spec:1.2
--- SPECS/gpsd.spec:1.1	Mon Nov 28 20:15:19 2005
+++ SPECS/gpsd.spec	Thu Dec  1 16:07:08 2005
@@ -3,26 +3,26 @@
 # - at this time package do not build with dbus support
 #   I do not need it ...
 # Conditional build:
-%bcond_without	dbus	# build without dbus support
+%bcond_with	dbus	# build with dbus support
 
 #
 Summary:	Service daemon for mediating access to a GPS
-#Summary(pl):
+Summary(pl):	Oprogramowanie komunikujące się z GPS'em
 Name:		gpsd
 Version:	2.30
-Release:	1
+Release:	1.1
 License:	BSD
 Group:		Daemons
 Source0:	http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
 # Source0-md5:	dde177174878e8ae6db15f8010da46dd
 Patch0:		%{name}-ncurses.patch
 URL:		http://gpsd.berlios.de/
-BuildRequires:	ncurses-devel
-BuildRequires:	X11-devel
-BuildRequires:	openmotif-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-%if %{?with_dbus}
+BuildRequires:	ncurses-devel
+BuildRequires:	openmotif-devel
+BuildRequires:	XFree86-devel
+%if %{with dbus}
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib-devel
 %endif
@@ -73,7 +73,7 @@
 xgpsspeed is a speedometer that uses position information from the
 GPS. It accepts an -h option and optional argument as for gps, or a -v
 option to dump the package version and exit. Additionally, it accepts
--rv (reverse video) and -nc (needle color) options.
+- -rv (reverse video) and -nc (needle color) options.
 
 cgps resembles xgps, but without the pictorial satellite display. It
 can run on a serial terminal or terminal emulator.
@@ -87,7 +87,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure %{?without_dbus: --enable-dbus}
+%configure \
+	%{?with_dbus: --enable-dbus}
+
 %{__make}
 %{__python} -c "import compiler;compiler.compileFile('gps.py')"
 %{__python} -c "import compiler;compiler.compileFile('gpsfake.py')"
@@ -95,11 +97,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/hotplug/usb,%{py_sitedir},%{_appdefsdir},%{_datadir}/gpsd/}
-#install -d $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT/%{_sysconfdir}/hotplug/usb
-#install -d $RPM_BUILD_ROOT/%{py_sitedir}
-#install -d $RPM_BUILD_ROOT/%{_appdefsdir}
-#install -d $RPM_BUILD_ROOT/%{_datadir}/gpsd/
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -113,11 +110,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n gpsd
-/sbin/ldconfig
+#%post -n gpsd
+#/sbin/ldconfig
 
-%postun -n gpsd
-/sbin/ldconfig
+#%postun -n gpsd
+#/sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -125,9 +122,10 @@
 %attr(755,root,root) %{_sbindir}/gpsd
 %attr(755,root,root) %{_bindir}/gpsprof
 %attr(755,root,root) %{_bindir}/sirfmon
-%{_libdir}/libgps.la
-%attr(755,root,root) %{_libdir}/libgps.so*
-%{_libdir}/libgps.a
+#%{_libdir}/libgps.la
+#%attr(755,root,root) %{_libdir}/libgps.so*
+#%{_libdir}/libgps.a
+%attr(755,root,root) %{_libdir}/libgps.so.15*
 %{_mandir}/man8/gpsd.8*
 %{_mandir}/man1/gpsprof.1*
 %{_mandir}/man1/sirfmon.1*
@@ -142,10 +140,10 @@
 %attr(755,root,root) %{_bindir}/xgpsspeed
 %attr(755,root,root) %{_bindir}/cgps
 %attr(755,root,root) %{_bindir}/gpspipe
-%{?without_dbus: %attr(755,root,root) %{_bindir}/gpxlogger}
+%{?with_dbus: %attr(755,root,root) %{_bindir}/gpxlogger}
 %{_mandir}/man1/xgps.1*
 %{_mandir}/man1/gpspipe.1*
-%{?without_dbus: %{_mandir}/man1/gpxlogger.1*}
+%{?with_dbus: %{_mandir}/man1/gpxlogger.1*}
 %{_appdefsdir}/xgps
 %{_appdefsdir}/xgpsspeed
 
@@ -172,6 +170,12 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
+Revision 1.2  2005/12/01 15:07:08  abram
+- cleanups
+- sorted BR
+- disabled ldconfig in post and postun
+- deleted files libgps.a and libgps.la
+
 Revision 1.1  2005/11/28 19:15:19  abram
 - initial
 - please forgive me, this is first spec, first commit ...
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gpsd.spec?r1=1.1&r2=1.2&f=u