packages: abrt/abrt.spec - more packaging, gid registered

[glen]

Author: glen                         Date: Mon Dec  7 21:41:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more packaging, gid registered

---- Files affected:
packages/abrt:
   abrt.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/abrt/abrt.spec
diff -u packages/abrt/abrt.spec:1.5 packages/abrt/abrt.spec:1.6
--- packages/abrt/abrt.spec:1.5	Mon Dec  7 12:43:25 2009
+++ packages/abrt/abrt.spec	Mon Dec  7 22:41:04 2009
@@ -31,7 +31,6 @@
 BuildRequires:	sqlite3-devel
 BuildRequires:	xmlrpc-c-devel >= 1.20.3-1
 BuildRequires:	zlib-devel
-Requires(postun):	/sbin/ldconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -257,22 +256,17 @@
 
 %py_postclean
 
-# remove all .la and .a files
-find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
+# remove all .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la %{_libdir}/lib*.la
+
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/abrtd
 install -d $RPM_BUILD_ROOT/var/cache/%{name}
 install -d $RPM_BUILD_ROOT/var/cache/%{name}-di
 install -d $RPM_BUILD_ROOT/var/run/%{name}
 
-desktop-file-install \
-        --dir $RPM_BUILD_ROOT%{_desktopdir} \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-
-desktop-file-install \
-        --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
-        src/Applet/%{name}-applet.desktop
+cp -a src/Gui/abrt.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -a src/Applet/%{name}-applet.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -282,7 +276,7 @@
 
 %post
 /sbin/chkconfig --add abrtd
-%service abortd restart
+%service abrtd restart
 
 %preun
 if [ "$1" = "0" ]; then
@@ -290,21 +284,21 @@
 	/sbin/chkconfig --del abrtd
 fi
 
-%post	libs -p /sbin/ldconfig
-
 %postun
-/sbin/ldconfig
 if [ "$1" = "0" ]; then
 	%groupremove abrt
 fi
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README COPYING
+%doc README
 %attr(755,root,root) %{_sbindir}/abrtd
 %attr(755,root,root) %{_bindir}/%{name}-debuginfo-install
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) /etc/dbus-1/system.d/dbus-%{name}.conf
+/etc/dbus-1/system.d/dbus-%{name}.conf
 %attr(754,root,root) /etc/rc.d/init.d/abrtd
 %dir %attr(775,root,abrt) /var/cache/%{name}
 %dir /var/cache/%{name}-di
@@ -441,6 +435,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/12/07 21:41:04  glen
+- more packaging, gid registered
+
 Revision 1.5  2009/12/07 11:43:25  glen
 - builds finally
 - rpm addon crippled (needs porting)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abrt/abrt.spec?r1=1.5&r2=1.6&f=u