rpms/conglomerate/devel .cvsignore, 1.3, 1.4 conglomerate.spec, 1.2, 1.3 sources, 1.3, 1.4

[Phillip Compton (pcompton)]

Changeset from: pcompton

Update of /cvs/extras/rpms/conglomerate/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv22217

Modified Files:
	.cvsignore conglomerate.spec sources 
Log Message:
conglomerate sync with fed.us, & add desktop-db update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conglomerate/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:10:40 -0000	1.3
+++ .cvsignore	27 Nov 2004 23:40:24 -0000	1.4
@@ -1 +1 @@
-conglomerate-0.7.14.tar.gz
+conglomerate-0.7.16.tar.gz


Index: conglomerate.spec
===================================================================
RCS file: /cvs/extras/rpms/conglomerate/devel/conglomerate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conglomerate.spec	8 Nov 2004 04:10:40 -0000	1.2
+++ conglomerate.spec	27 Nov 2004 23:40:24 -0000	1.3
@@ -1,32 +1,34 @@
 Name:           conglomerate
-Version:        0.7.14
-Release:        0.fdr.2.2
-Epoch:          0
+Version:        0.7.16
+Release:        3
 Summary:        Extensible XML Editor.
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://www.conglomerate.org/
-Source0:        http://download.sourceforge.net/conglomerate/conglomerate-0.7.14.tar.gz
+Source0:        http://download.sourceforge.net/conglomerate/conglomerate-0.7.16.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel
-BuildRequires:  libgnomeui-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  gtk-doc
+BuildRequires:  gtk2-devel >= 2.4.0
+BuildRequires:  gtksourceview-devel
+BuildRequires:	intltool
 BuildRequires:  libglade2-devel
+BuildRequires:  libgnomeui-devel
 BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  gtksourceview-devel >= 0:0.5
-BuildRequires:  gtk2-devel >= 0:2.4.0
+BuildRequires:  libtool
+BuildRequires:  libxml2-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  scrollkeeper
-BuildRequires:	intltool
-BuildRequires:  libtool
-BuildRequires:  gettext
-BuildRequires:	desktop-file-utils
 
-Requires:       yelp
+Requires:         yelp
+Requires(post):   desktop-file-utils
+Requires(post):   GConf2
 Requires(post):   scrollkeeper
+Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
-Requires(post):   GConf2
 Requires(preun):  GConf2
 
 
@@ -38,21 +40,19 @@
 performs storage, searching, revision control, transformation and publishing.
 
 
-
 %prep
 %setup -q
 
 
-
 %build
 libtoolize --automake
-%configure                \
-        --enable-gtksourceview
-#        --enable-printing
+%configure                     \
+        --enable-gtksourceview \
+        --enable-printing      \
+        --disable-schemas-install
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -69,17 +69,15 @@
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-
 %post
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
 scrollkeeper-update -q
-
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %preun
@@ -87,17 +85,15 @@
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
 
 
-
 %postun
 scrollkeeper-update -q
-
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
 %doc %{_datadir}/gnome/help/conglomerate/
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/conglomerate/
@@ -106,10 +102,21 @@
 %{_datadir}/application-registry/conglomerate.applications
 %{_datadir}/mime-info/*
 %{_datadir}/gtk-doc/html/conglomerate/
-
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sat Nov 27 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.7.16-3
+- post/postun update-desktop-db.
+
+* Sat Nov 13 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.7.16-0.fdr.2
+- Spec cleanup.
+
+* Sat Nov 06 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.7.16-0.fdr.1
+- 0.7.16.
+- re-enable printing.
+- BR gtk-doc.
+
 * Fri Jul 23 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.14-0.fdr.2
 - BuildReq gtk2-devel >= 2.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conglomerate/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:10:40 -0000	1.3
+++ sources	27 Nov 2004 23:40:24 -0000	1.4
@@ -1 +1 @@
-1a04815a1059987aea45816aa1401bc3  conglomerate-0.7.14.tar.gz
+75e35bd95e6a781d1346083b097f0c71  conglomerate-0.7.16.tar.gz