rpms/gdeskcal/FC-5 .cvsignore, 1.3, 1.4 gdeskcal.desktop, 1.2, 1.3 gdeskcal.spec, 1.9, 1.10 sources, 1.3, 1.4

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7524/FC-5

Modified Files:
	.cvsignore gdeskcal.desktop gdeskcal.spec sources 
Log Message:
auto-import gdeskcal-1.0-4 on branch FC-5 from gdeskcal-1.0-4.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:22:43 -0000	1.3
+++ .cvsignore	1 Nov 2006 10:52:28 -0000	1.4
@@ -1 +1 @@
-gDeskCal-0_57_1.tar.gz
+gDeskCal-1.0.tar.gz


Index: gdeskcal.desktop
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/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:52:28 -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/FC-5/gdeskcal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdeskcal.spec	10 Apr 2006 10:42:40 -0000	1.9
+++ gdeskcal.spec	1 Nov 2006 10:52:28 -0000	1.10
@@ -1,11 +1,11 @@
 Name:           gdeskcal
-Version:        0.57.1
-Release:        5%{?dist}
+Version:        1.0
+Release:        4%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
-Source0:        http://www.pycage.de/download/gDeskCal-0_57_1.tar.gz
+Source0:        http://www.pycage.de/download/gDeskCal-1.0.tar.gz
 Source1:        gdeskcal.png
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,45 +22,54 @@
 transparency with smooth alpha-blending and its appearance can be changed
 completely by using skins.
 
-
 %prep
 %setup -q -n gDeskCal-%{version}
 
 %build
-
+%configure
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-mkdir -p  ${RPM_BUILD_ROOT}/%{_datadir}
-cp -a code data po skins ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-cp -a locale ${RPM_BUILD_ROOT}/%{_datadir}/
-cp -a gdeskcal ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}
-mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}/
-ln -sf %{_libdir}/%{name}-%{version}/gdeskcal ${RPM_BUILD_ROOT}/%{_bindir}/
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gdeskcal.png
-%find_lang %{name}
+rm -rf %{buildroot}
+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
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%post
+update-desktop-database &> /dev/null ||:
+
+%postun
+update-desktop-database &> /dev/null ||:
 
+%clean
+rm -rf %{buildroot}
 
-%files -f %{name}.lang
+%files -f gdesklets.lang
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README README.i18n README.skins
+%doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
+%exclude %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}-%{version}
-
+%{_libdir}/%{name}/
 
 %changelog
+* Wed Nov 01 2006 Paul F. Johnson <paul at 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 at all-the-johnsons.co.uk> 1.0-1
+- bump to new version
+
 * Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
 - rebuilt
 - minor spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:22:43 -0000	1.3
+++ sources	1 Nov 2006 10:52:28 -0000	1.4
@@ -1 +1 @@
-c2c1de1046e9026558c51e90fe6f8a9e  gDeskCal-0_57_1.tar.gz
+eddbf6387b9937c067e9c437f1abfacf  gDeskCal-1.0.tar.gz