Author: pfj
Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7724/devel
Modified Files:
gdeskcal.desktop gdeskcal.spec
Log Message:
auto-import gdeskcal-1.0-4 on branch devel from gdeskcal-1.0-4.src.rpm
Index: gdeskcal.desktop
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdeskcal.desktop 8 Nov 2004 04:22:43 -0000 1.2
+++ gdeskcal.desktop 1 Nov 2006 10:55:20 -0000 1.3
@@ -1,9 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-Name=gDeskCal
-Comment=Calendar program for the Gnome Desktop.
+Name=gDeskcal
+Comment=A desktop calendar
Exec=gdeskcal
Icon=gdeskcal.png
Terminal=false
Type=Application
Categories=Application;Utility;
+StartupNotify=true
Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdeskcal.spec 11 Oct 2006 11:36:27 -0000 1.12
+++ gdeskcal.spec 1 Nov 2006 10:55:20 -0000 1.13
@@ -1,6 +1,6 @@
Name: gdeskcal
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Eye-candy calendar for your desktop
Group: User Interface/Desktops
License: GPL
@@ -10,7 +10,7 @@
Source2: gdeskcal.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils perl(XML::Parser)
+BuildRequires: desktop-file-utils
Requires: pygtk2 >= 1.99.14
Requires: python >= 2.0.0
@@ -22,7 +22,6 @@
transparency with smooth alpha-blending and its appearance can be changed
completely by using skins.
-
%prep
%setup -q -n gDeskCal-%{version}
@@ -32,33 +31,41 @@
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_libdir}/%{name}
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_bindir}
-cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/
-install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin
-ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name}
install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png
+make DESTDIR=%{buildroot} install
+
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+%if "%{?fedora}" <= "6"
--add-category X-Fedora \
+%endif
%{SOURCE2}
+%find_lang gdesklets
+
+%post
+update-desktop-database &> /dev/null ||:
+
+%postun
+update-desktop-database &> /dev/null ||:
+
%clean
rm -rf %{buildroot}
-%files
+%files -f gdesklets.lang
%defattr(-,root,root,-)
%doc AUTHORS NEWS README
%{_bindir}/gdeskcal
%{_datadir}/applications/fedora-%{name}.desktop
+%exclude %{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}
-
+%{_libdir}/%{name}/
%changelog
-* Sun Oct 08 2006 Paul F. Johnson <paul(a)all-the-johnsons.co.uk> 1.0-2
-- Remove using the real makeinstall as it's broken
+* Wed Nov 01 2006 Paul F. Johnson <paul(a)all-the-johnsons.co.uk> 1.0-4
+- added post and postun
+- conditional for the X-Fedora in the desktop icon
+- fixed the spec file
* Sat Oct 07 2006 Paul F. Johnson <paul(a)all-the-johnsons.co.uk> 1.0-1
- bump to new version