rpms/contacts/devel .cvsignore, 1.2, 1.3 contacts.spec, 1.4, 1.5 sources, 1.2, 1.3

[Jesse Keating (jkeating)]

Author: jkeating

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

Modified Files:
	.cvsignore contacts.spec sources 
Log Message:
Pull an SVN snapshot of contats for new evo-data-server



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Apr 2006 03:01:38 -0000	1.2
+++ .cvsignore	13 Aug 2006 20:57:41 -0000	1.3
@@ -1 +1 @@
-contacts-0.1.tar.gz
+contacts-0.1svn.tar.gz


Index: contacts.spec
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/contacts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- contacts.spec	7 Aug 2006 21:49:50 -0000	1.4
+++ contacts.spec	13 Aug 2006 20:57:41 -0000	1.5
@@ -1,17 +1,23 @@
 Name:		contacts        
 Version:        0.1
-Release:        3%{?dist}
+Release:        4.20060813svn%{?dist}
 Summary:        Contacts addressbook
 
 Group:         	Applications/Productivity
 License:       	GPL 
 URL:            http://projects.o-hand.com/contacts
-Source0:        http://www.openedhand.com/~chris/%{name}-%{version}.tar.gz
+#Source0:        http://www.openedhand.com/~chris/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}svn.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 BuildRequires:  libglade2-devel >= 2.0.0
 BuildRequires:  evolution-data-server-devel >= 1.2.0
 BuildRequires: 	desktop-file-utils
+# Needed for svn snapshot
+BuildRequires: 	automake gnome-common libtool intltool gettext
 
 %description
 Contacts is a small, lightweight addressbook that uses libebook. 
@@ -21,30 +27,60 @@
 devices, such as the Nokia 770 or the Sharp Zaurus series of PDAs.
 
 %prep
-%setup -q
+%setup -n %{name}-%{version}svn -q
 
 
 %build
+./autogen.sh
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor fedora --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
   --add-category X-Fedora			        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+%find_lang Contacts
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+    # If the schema file has ever been renamed::
+    #gconftool-2 --makefile-uninstall-rule \
+    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
+fi
+
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
+
+%files -f Contacts.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/pixmaps/oh-contacts.png
 %{_datadir}/contacts/contacts.glade
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -52,8 +88,8 @@
 
 
 %changelog
-* Mon Aug 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1-3
-- Bump for new evo-data-server
+* Sun Aug 11 2006 Jesse Keating <jkeating at redhat.com> - 0.1-4.20060813svn
+- Pull an SVN snapshot for e-d-s fixes (among other things)
 
 * Fri Jun 09 2006 Jesse Keating <jkeating at redhat.com> - 0.1-2
 - Bump for newer mock


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Apr 2006 03:01:38 -0000	1.2
+++ sources	13 Aug 2006 20:57:41 -0000	1.3
@@ -1 +1 @@
-dc5a650445f0904392039006d929f192  contacts-0.1.tar.gz
+e73ce65a752ab7b4138c6118ace09132  contacts-0.1svn.tar.gz