rpms/gramps/devel .cvsignore, 1.14, 1.15 gramps.spec, 1.22, 1.23 sources, 1.14, 1.15

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Sat Nov  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.2.2-1
- Update to 2.2.2.
- Add scriptlet for gtk+ icon cache.
- Disable scrollkeeper & mime-install in configure.
- Simplify files since we are no longer ghosting *.pyo files.
- Drop X-Fedora desktop category.
- Add BR on gnome-doc-utils.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 May 2006 15:16:56 -0000	1.14
+++ .cvsignore	4 Nov 2006 16:51:59 -0000	1.15
@@ -1 +1 @@
-gramps-2.0.11.tar.gz
+gramps-2.2.2.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gramps.spec	6 Sep 2006 14:24:29 -0000	1.22
+++ gramps.spec	4 Nov 2006 16:51:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        2.0.11
-Release:        5%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -19,6 +19,7 @@
 BuildRequires:  pygtk2-libglade
 BuildRequires:  python-devel
 BuildRequires:  scrollkeeper
+BuildRequires:	gnome-doc-utils
 
 Requires:       gnome-python2-canvas
 Requires:       gnome-python2-gconf
@@ -51,24 +52,23 @@
 
 
 %build
-%configure --disable-schemas-install
+%configure --disable-schemas-install --disable-scrollkeeper --disable-mime-install
 make
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall GNOME_DATADIR="${RPM_BUILD_ROOT}%{_datadir}"
-rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome/
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{application,mime.cache}
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses}
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-cp -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
+#Remove duplicate doc
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/COPYING
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+cp -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+
 %find_lang %{name}
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -91,6 +91,8 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %preun
@@ -105,49 +107,36 @@
 scrollkeeper-update -q || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS FAQ NEWS TODO
 %{_bindir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/omf/%{name}/
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mime-info/*
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_mandir}/man1/%{name}.1.gz
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.py
-%{_datadir}/%{name}/*.pyc
-%{_datadir}/%{name}/*.png
-%{_datadir}/%{name}/*.jpg
-%{_datadir}/%{name}/*.glade
-%{_datadir}/%{name}/*.pyo
-%{_datadir}/%{name}/data/
-%dir %{_datadir}/%{name}/dates
-%{_datadir}/%{name}/dates/*.py
-%{_datadir}/%{name}/dates/*.pyc
-%{_datadir}/%{name}/dates/*.pyo
-%dir %{_datadir}/%{name}/docgen
-%{_datadir}/%{name}/docgen/*.py
-%{_datadir}/%{name}/docgen/*.pyc
-%{_datadir}/%{name}/docgen/*.pyo
-%{_datadir}/%{name}/example/
-%{_datadir}/%{name}/gnome/
-%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/*.py
-%{_datadir}/%{name}/plugins/*.pyc
-%{_datadir}/%{name}/plugins/*.glade
-%{_datadir}/%{name}/plugins/*.xml
-%{_datadir}/%{name}/plugins/*.png
-%{_datadir}/%{name}/plugins/*.pyo
+%{_datadir}/gnome/help/%{name}/
 
 
 %changelog
+* Sat Nov  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.2.2-1
+- Update to 2.2.2.
+- Add scriptlet for gtk+ icon cache.
+- Disable scrollkeeper & mime-install in configure.
+- Simplify files since we are no longer ghosting *.pyo files.
+- Drop X-Fedora desktop category.
+- Add BR on gnome-doc-utils.
+
 * Wed Sep  6 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.0.11-5
 - Don't ghost *.pyo files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 May 2006 15:16:56 -0000	1.14
+++ sources	4 Nov 2006 16:51:59 -0000	1.15
@@ -1 +1 @@
-650873c3c571a921a9c42b975ced2105  gramps-2.0.11.tar.gz
+c640782457bccc7324d17c1baf21701c  gramps-2.2.2.tar.gz