|
|
Author: mclasen
Update of /cvs/dist/rpms/gnome-pilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15586
Modified Files:
gnome-pilot.spec
Log Message:
Spec cleanups
Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-pilot.spec 1 Dec 2006 14:58:01 -0000 1.52
+++ gnome-pilot.spec 7 Feb 2007 15:35:40 -0000 1.53
@@ -4,12 +4,12 @@
Name: gnome-pilot
Version: 2.0.15
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPL
Group: Applications/Communications
Summary: GNOME pilot programs
Source: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: s390 s390x
### Patches ###
@@ -19,8 +19,12 @@
### Dependencies ###
-Prereq: GConf2
-Prereq: scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(postun): GConf2
Requires: pilot-link >= %{pilot_link_version}
@@ -39,6 +43,7 @@
BuildRequires: libgnomeui-devel >= 2.0.0
BuildRequires: libtool
BuildRequires: pilot-link-devel >= %{pilot_link_version}
+BuildRequires: desktop-file-utils
%description
gnome-pilot is a collection of programs and daemon for integrating
@@ -47,10 +52,11 @@
%package devel
Group: Development/Libraries
Summary: GNOME pilot libraries, includes, etc
-Requires: %name = %{version}
+Requires: %name = %{version}-%{release}
Requires: ORBit2-devel
Requires: libgnomeui-devel
Requires: pilot-link-devel >= %{pilot_link_version}
+Requires: pkgconfig
%description devel
gpilotd libraries and includes.
@@ -73,7 +79,14 @@
%makeinstall LIBTOOL=%{_bindir}/libtool
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+desktop-file-install --vendor="" \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category=Application \
+ --add-category=HardwareSettings \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gpilotd-control-applet.desktop
+
mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit \
+
$RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
@@ -87,13 +100,20 @@
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="pilot.schemas"
-for S in $SCHEMAS; do
- gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/pilot.schemas
> /dev/null
scrollkeeper-update
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule
%{_sysconfdir}/gconf/schemas/pilot.schemas > /dev/null
+fi
+
%postun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule
%{_sysconfdir}/gconf/schemas/pilot.schemas > /dev/null
+fi
/sbin/ldconfig
scrollkeeper-update
@@ -124,11 +144,15 @@
%files devel
%defattr(-, root, root)
%{_includedir}/*
-%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Feb 7 2007 Matthias Clasen <mclasen@xxxxxxxxxx> - 2.0.15-4
+- Use desktop-file-install
+- Remove invalid category Application, add HardwareSettings
+- Other small spec cleanups
+
* Fri Dec 01 2006 Matthew Barnes <mbarnes@xxxxxxxxxx> - 2.0.15-3.fc7
- Remove patch for GNOME bug #362565 (fixed upstream).
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|