rpms/gnome-chemistry-utils/F-8 .cvsignore, 1.7, 1.8 gnome-chemistry-utils.spec, 1.12, 1.13 sources, 1.7, 1.8

Julian Sikorski (belegdol) fedora-extras-commits at redhat.com
Fri Dec 21 17:53:47 UTC 2007


Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9024

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Fri Dec 21 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.5-1
- Updated to 0.8.5
- Conditionalised xulrunner usage



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Oct 2007 19:54:45 -0000	1.7
+++ .cvsignore	21 Dec 2007 17:53:11 -0000	1.8
@@ -1 +1 @@
-gnome-chemistry-utils-0.8.4.tar.bz2
+gnome-chemistry-utils-0.8.5.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-8/gnome-chemistry-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-chemistry-utils.spec	30 Oct 2007 19:54:45 -0000	1.12
+++ gnome-chemistry-utils.spec	21 Dec 2007 17:53:11 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gnome-chemistry-utils
-Version:        0.8.4
+Version:        0.8.5
 Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
@@ -9,21 +9,26 @@
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  openbabel-devel >= 2.1.0
+BuildRequires:  bodr
+BuildRequires:  chemical-mime-data
+BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
+BuildRequires:  gettext
+BuildRequires:  gnome-doc-utils
 BuildRequires:  goffice04-devel
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  gtkglext-devel
+BuildRequires:  kdelibs3
 BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  firefox-devel
 BuildRequires:  man
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
-BuildRequires:  chemical-mime-data
-BuildRequires:  bodr
-BuildRequires:  kdelibs
+BuildRequires:  openbabel-devel >= 2.1.0
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  scrollkeeper
-BuildRequires:  gnome-doc-utils
+%if 0%{?fedora} >= 9
+BuildRequires:  xulrunner-devel
+%else
+BuildRequires:  firefox-devel
+%endif
+
 Requires:       chemical-mime-data
 
 Requires(pre):  GConf2
@@ -35,7 +40,7 @@
 
 %description
 This package is a set of chemical utils. Four programs are available:
-* A 3D molecular structure viewer (GChem3Viewer).
+* A 3D molecular structure viewer (GChem3DViewer).
 * A Chemical calculator (GChemCalc).
 * A periodic table of the elements application (GChemTable).
 * A crystalline structure editor (GCrystal).
@@ -44,16 +49,16 @@
 Summary:        Development package for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libgnomeui-devel
-Requires:       libgnomeprintui22-devel
+Requires:       goffice04-devel
 Requires:       gtkglext-devel
+Requires:       libgnomeprintui22-devel
+Requires:       libgnomeui-devel
 Requires:       openbabel-devel
-Requires:       goffice04-devel
 Requires:       pkgconfig
 
 %description    devel
 This package is a set of chemical utils. Four programs are available:
-* A 3D molecular structure viewer (GChem3Viewer).
+* A 3D molecular structure viewer (GChem3DViewer).
 * A Chemical calculator (GChemCalc).
 * A periodic table of the elements application (GChemTable).
 * A crystalline structure editor (GCrystal).
@@ -67,7 +72,7 @@
 
 %description    mozplugin
 This package is a set of chemical utils. Four programs are available:
-* A 3D molecular structure viewer (GChem3Viewer).
+* A 3D molecular structure viewer (GChem3DViewer).
 * A Chemical calculator (GChemCalc).
 * A periodic table of the elements application (GChemTable).
 * A crystalline structure editor (GCrystal).
@@ -93,28 +98,20 @@
 make INSTALL="install -p" install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor=fedora \
        --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/gchem3d-viewer.desktop
-desktop-file-install --vendor=fedora \
-       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/gchemcalc.desktop
-desktop-file-install --vendor=fedora \
-       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/gchemtable.desktop
-desktop-file-install --vendor=fedora \
-       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/gcrystal.desktop
+       $RPM_BUILD_ROOT%{_datadir}/applications/{gchem3d-viewer,gchemcalc,gchemtable,gcrystal}.desktop
 %find_lang gchemutils
 
 #kill libtool archives
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgcu.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/libmozgcu.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 #kill intrusive docs
 rm -rf $RPM_BUILD_ROOT%{_docdir}/gchemutils
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -123,37 +120,38 @@
     # If the schema file has ever been renamed::
     #gconftool-2 --makefile-uninstall-rule \
     #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
+
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/gcrystal.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
 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 || :
-scrollkeeper-update -q -o %{_datadir}/omf/gchem3d-viewer || :
-scrollkeeper-update -q -o %{_datadir}/omf/gchemcalc || :
-scrollkeeper-update -q -o %{_datadir}/omf/gchemtable || :
-scrollkeeper-update -q -o %{_datadir}/omf/gcrystal || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+scrollkeeper-update -q -o %{_datadir}/omf/{gchem3d-viewer,gchemcalc,gchemtable,gcrystal} || :
 /sbin/ldconfig
 
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/gcrystal.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
+
 %postun
 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 || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 scrollkeeper-update -q || :
 /sbin/ldconfig
 
@@ -161,16 +159,17 @@
 %files -f gchemutils.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%{_sysconfdir}/gconf/schemas/gcrystal.schemas
 %{_bindir}/gchem3d-viewer
 %{_bindir}/gchemcalc
 %{_bindir}/gchemtable
 %{_bindir}/gcrystal
+%{_libdir}/libgcu.so.*
+%{_libexecdir}/chem-viewer
 %{_datadir}/applications/fedora-gchem3d-viewer.desktop
 %{_datadir}/applications/fedora-gchemcalc.desktop
 %{_datadir}/applications/fedora-gchemtable.desktop
 %{_datadir}/applications/fedora-gcrystal.desktop
-%{_libdir}/libgcu.so.*
-%{_libexecdir}/chem-viewer
 %{_datadir}/gchemutils
 %{_datadir}/gnome/help/gchem3d-viewer
 %{_datadir}/gnome/help/gchemcalc
@@ -178,13 +177,12 @@
 %{_datadir}/gnome/help/gcrystal
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-application-x-gcrystal.png
-%{_datadir}/mime/packages/gchemutils.xml
 %{_mandir}/man1/gchem3d-viewer.1*
 %{_mandir}/man1/gchemcalc.1*
 %{_mandir}/man1/gchemtable.1*
 %{_mandir}/man1/gcrystal.1*
 %{_mandir}/man3/libgcu.3*
-%{_sysconfdir}/gconf/schemas/gcrystal.schemas
+%{_datadir}/mime/packages/gchemutils.xml
 %{_datadir}/mimelnk
 %{_datadir}/omf/gchem3d-viewer
 %{_datadir}/omf/gchemcalc
@@ -204,6 +202,14 @@
 
 
 %changelog
+* Fri Dec 21 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.5-1
+- Updated to 0.8.5
+- Conditionalised xulrunner usage
+
+* Thu Dec  6 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.4-2
+- Rebuilt against xulrunner
+- Cleaned up the spec
+
 * Tue Oct 30 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.4-1
 - Updated to 0.8.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Oct 2007 19:54:45 -0000	1.7
+++ sources	21 Dec 2007 17:53:11 -0000	1.8
@@ -1 +1 @@
-47829f6544ab7ea5c4c65a84cfb4c5c8  gnome-chemistry-utils-0.8.4.tar.bz2
+595b106ecc707ea1c00da81d1f963a91  gnome-chemistry-utils-0.8.5.tar.bz2




More information about the fedora-extras-commits mailing list