rpms/gdeskcal/devel .cvsignore, 1.3, 1.4 gdeskcal.spec, 1.10, 1.11 sources, 1.3, 1.4

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6136/devel

Modified Files:
	.cvsignore gdeskcal.spec sources 
Log Message:
auto-import gdeskcal-1.0-2 on branch devel from gdeskcal-1.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/.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	8 Oct 2006 14:04:24 -0000	1.4
@@ -1 +1 @@
-gDeskCal-0_57_1.tar.gz
+gDeskCal-1.0.tar.gz


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdeskcal.spec	6 Oct 2006 23:49:47 -0000	1.10
+++ gdeskcal.spec	8 Oct 2006 14:04:24 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           gdeskcal
-Version:        0.57.1
-Release:        6%{?dist}
+Version:        1.0
+Release:        2%{?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)
@@ -27,42 +27,41 @@
 %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}
+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
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   %{SOURCE2}
 
-
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README README.i18n README.skins
+%doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}
 
 
 %changelog
-* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-6
-- rebuild
+* Sun Oct 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-2
+- Remove using the real makeinstall as it's broken
+
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/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	8 Oct 2006 14:04:24 -0000	1.4
@@ -1 +1 @@
-c2c1de1046e9026558c51e90fe6f8a9e  gDeskCal-0_57_1.tar.gz
+eddbf6387b9937c067e9c437f1abfacf  gDeskCal-1.0.tar.gz