[gnome-chemistry-utils] Updated to 0.13.5 Dropped obsolete Group, Buildroot, %clean and %defattr GConf2 is no more
belegdol
belegdol at fedoraproject.org
Tue Jan 10 01:40:39 UTC 2012
commit 4c3647bba2ef6df901c99dd400e68f4286efee1c
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date: Tue Jan 10 02:28:18 2012 +0100
Updated to 0.13.5
Dropped obsolete Group, Buildroot, %clean and %defattr
GConf2 is no more
.gitignore | 1 +
gnome-chemistry-utils-0.13.5-destdir.patch | 31 +++++
gnome-chemistry-utils-0.13.5-glib.patch | 24 ++++
gnome-chemistry-utils.spec | 194 +++++++++++++---------------
sources | 2 +-
5 files changed, 148 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3bd25d..f7ac509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gnome-chemistry-utils-0.12.3.tar.bz2
/gnome-chemistry-utils-0.12.8.tar.bz2
/gnome-chemistry-utils-0.12.9.tar.xz
/gnome-chemistry-utils-0.12.10.tar.xz
+/gnome-chemistry-utils-0.13.5.tar.xz
diff --git a/gnome-chemistry-utils-0.13.5-destdir.patch b/gnome-chemistry-utils-0.13.5-destdir.patch
new file mode 100644
index 0000000..8f91747
--- /dev/null
+++ b/gnome-chemistry-utils-0.13.5-destdir.patch
@@ -0,0 +1,31 @@
+diff -up gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am.destdir gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am
+--- gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am.destdir 2011-11-11 17:50:38.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am 2012-01-10 00:40:43.069240779 +0100
+@@ -1,10 +1,10 @@
+ MAINTAINERCLEANFILES = Makefile.in
+
+-pixmapdir = $(DESTDIR)$(datadir)/gchemutils/@GCU_API_VER@/pixmaps
++pixmapdir = $(datadir)/gchemutils/@GCU_API_VER@/pixmaps
+ dist_pixmap_DATA = gcrystal_logo.png gchempaint_logo.png
+
+
+-iconsdir = $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
++iconsdir = $(datadir)/icons/hicolor/scalable/apps
+ dist_icons_DATA = \
+ gchem3d.svg \
+ gchemcalc.svg \
+diff -up gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in.destdir gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in
+--- gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in.destdir 2011-11-11 17:55:17.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in 2012-01-10 00:40:43.069240779 +0100
+@@ -287,9 +287,9 @@ x11_LIBS = @x11_LIBS@
+ xml_CFLAGS = @xml_CFLAGS@
+ xml_LIBS = @xml_LIBS@
+ MAINTAINERCLEANFILES = Makefile.in
+-pixmapdir = $(DESTDIR)$(datadir)/gchemutils/@GCU_API_VER@/pixmaps
++pixmapdir = $(datadir)/gchemutils/@GCU_API_VER@/pixmaps
+ dist_pixmap_DATA = gcrystal_logo.png gchempaint_logo.png
+-iconsdir = $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
++iconsdir = $(datadir)/icons/hicolor/scalable/apps
+ dist_icons_DATA = \
+ gchem3d.svg \
+ gchemcalc.svg \
diff --git a/gnome-chemistry-utils-0.13.5-glib.patch b/gnome-chemistry-utils-0.13.5-glib.patch
new file mode 100644
index 0000000..175a93f
--- /dev/null
+++ b/gnome-chemistry-utils-0.13.5-glib.patch
@@ -0,0 +1,24 @@
+diff -up gnome-chemistry-utils-0.13.5/programs/3d/document.cc.glib gnome-chemistry-utils-0.13.5/programs/3d/document.cc
+--- gnome-chemistry-utils-0.13.5/programs/3d/document.cc.glib 2011-11-11 17:50:50.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/programs/3d/document.cc 2012-01-10 00:40:43.067240769 +0100
+@@ -28,7 +28,7 @@
+ #include "view.h"
+ #include "window.h"
+ #include <gcugtk/molecule.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+
+ gc3dDocument::gc3dDocument (gc3dApplication *App): gcugtk::Chem3dDoc (App, new gc3dView (this))
+ {
+diff -up gnome-chemistry-utils-0.13.5/programs/spectra/document.cc.glib gnome-chemistry-utils-0.13.5/programs/spectra/document.cc
+--- gnome-chemistry-utils-0.13.5/programs/spectra/document.cc.glib 2011-11-11 17:50:50.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/programs/spectra/document.cc 2012-01-10 00:40:43.067240769 +0100
+@@ -27,7 +27,7 @@
+ #include "application.h"
+ #include "view.h"
+ #include "window.h"
+-#include <glib/gutils.h>
++#include <glib.h>
+
+ using namespace gcu;
+ using namespace std;
diff --git a/gnome-chemistry-utils.spec b/gnome-chemistry-utils.spec
index 4ef7f37..9ef8632 100644
--- a/gnome-chemistry-utils.spec
+++ b/gnome-chemistry-utils.spec
@@ -1,13 +1,13 @@
Name: gnome-chemistry-utils
-Version: 0.12.10
+Version: 0.13.5
Release: 1%{?dist}
Summary: A set of chemical utilities
-Group: Applications/Engineering
License: GPLv2+
URL: http://www.nongnu.org/gchemutils/
-Source0: http://download.savannah.nongnu.org/releases/gchemutils/0.12/%{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://download.savannah.nongnu.org/releases/gchemutils/0.13/%{name}-%{version}.tar.xz
+Patch0: %{name}-%{version}-glib.patch
+Patch1: %{name}-%{version}-destdir.patch
BuildRequires: bodr
BuildRequires: chemical-mime-data
@@ -29,10 +29,6 @@ Requires: bodr
Requires: chemical-mime-data
Requires: hicolor-icon-theme
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-
%description
This package is a set of chemical utils. Several programs are available:
* A 3D molecular structure viewer (GChem3D).
@@ -44,8 +40,7 @@ This package is a set of chemical utils. Several programs are available:
%package gnumeric
Summary: Gnome Chemistry Utils plugin for Gnumeric
-Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description gnumeric
This package is a set of chemical utils. Several programs are available:
@@ -60,8 +55,7 @@ gnumeric.
%package mozplugin
Summary: Gnome Chemistry Utils plugin for Mozilla
-Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: mozilla-filesystem
%description mozplugin
@@ -77,10 +71,11 @@ This package contains the mozilla plugin.
%prep
%setup -q
+%patch0 -p1 -b .glib
+%patch1 -p1 -b .destdir
%build
%configure --disable-update-databases \
- --disable-schemas-install \
--disable-scrollkeeper \
--with-mozilla-libdir=%{_libdir}/mozilla \
--disable-silent-rules
@@ -92,8 +87,8 @@ rm -rf $RPM_BUILD_ROOT
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,gchemcalc,gchempaint,gchemtable,gcrystal,gspectrum}-0.12.desktop
-%find_lang gchemutils-0.12
+ $RPM_BUILD_ROOT%{_datadir}/applications/{gchem3d,gchemcalc,gchempaint,gchemtable,gcrystal,gspectrum}-0.14.desktop
+%find_lang gchemutils-0.14
#kill libtool archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -102,59 +97,51 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -rf $RPM_BUILD_ROOT%{_docdir}/gchemutils
#kill rpaths
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchem3d-0.12
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchemcalc-0.12
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchempaint-0.12
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.12
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.12
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.12
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/cdx/cdx.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/cdxml/cdxml.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/cif/cif.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/cml/cml.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/arrows.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/atoms.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/bonds.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/cycles.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/residues.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/selection.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/templates.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/text.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.12/plugins/paint/wikipedia.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gnumeric/*/plugins/gchemutils/plugin.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/goffice/*/plugins/gchemutils/gchemutils.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgcp-0.12.so.%{version}
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchem3d-0.14
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchemcalc-0.14
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchempaint-0.14
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.14
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.14
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.14
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/cdx/cdx.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/cdxml/cdxml.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/cif/cif.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/cml/cml.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/ctfiles/ctfiles.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/nuts/nuts.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/arrows.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/atoms.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/bonds.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/cycles.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/residues.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/selection.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/templates.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.14/plugins/paint/text.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gnumeric/1.12/plugins/gchemutils/plugin.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/goffice/0.10/plugins/gchemutils/gchemutils.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgcp-0.14.so.%{version}
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgcrystal-0.14.so.%{version}
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgcugtk-0.14.so.%{version}
chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/chem-viewer
#kill KDE MIME .desktop files
rm -rf $RPM_BUILD_ROOT%{_datadir}/mimelnk
#kill the unnecessary .so symlinks
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgccv-0.12.so
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcp-0.12.so
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcu-0.12.so
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%pre
-%gconf_schema_prepare gchempaint gchempaint-arrows gchemutils gcrystal
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgccv-0.14.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcp-0.14.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcrystal-0.14.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcu-0.14.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcugtk-0.14.so
%post
-%gconf_schema_upgrade gchempaint gchempaint-arrows gchemutils gcrystal
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/sbin/ldconfig
-%preun
-%gconf_schema_remove gchempaint gchempaint-arrows gchemutils gcrystal
-
-
%postun
if [ $1 -eq 0 ] ; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
@@ -173,72 +160,73 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files -f gchemutils-0.12.lang
-%defattr(-,root,root,-)
+%files -f gchemutils-0.14.lang
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{_sysconfdir}/gconf/schemas/gchempaint.schemas
-%{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
-%{_sysconfdir}/gconf/schemas/gchemutils.schemas
-%{_sysconfdir}/gconf/schemas/gcrystal.schemas
-%{_bindir}/gchem3d
-%{_bindir}/gchem3d-0.12
-%{_bindir}/gchemcalc
-%{_bindir}/gchemcalc-0.12
-%{_bindir}/gchempaint
-%{_bindir}/gchempaint-0.12
-%{_bindir}/gchemtable
-%{_bindir}/gchemtable-0.12
-%{_bindir}/gcrystal
-%{_bindir}/gcrystal-0.12
-%{_bindir}/gspectrum
-%{_bindir}/gspectrum-0.12
+%{_bindir}/gchem3d-0.14
+%{_bindir}/gchem3d-unstable
+%{_bindir}/gchemcalc-0.14
+%{_bindir}/gchemcalc-unstable
+%{_bindir}/gchempaint-0.14
+%{_bindir}/gchempaint-unstable
+%{_bindir}/gchemtable-0.14
+%{_bindir}/gchemtable-unstable
+%{_bindir}/gcrystal-0.14
+%{_bindir}/gcrystal-unstable
+%{_bindir}/gspectrum-0.14
+%{_bindir}/gspectrum-unstable
%{_libdir}/gchemutils
%{_libdir}/goffice/*/plugins/gchemutils
-%{_libdir}/libgccv-0.12.so.*
-%{_libdir}/libgcp-0.12.so.*
-%{_libdir}/libgcu-0.12.so.*
+%{_libdir}/libgccv-0.14.so.*
+%{_libdir}/libgcp-0.14.so.*
+%{_libdir}/libgcrystal-0.14.so.*
+%{_libdir}/libgcu-0.14.so.*
+%{_libdir}/libgcugtk-0.14.so.*
+%{_libexecdir}/babelserver
%{_libexecdir}/chem-viewer
-%{_datadir}/applications/fedora-gchem3d-0.12.desktop
-%{_datadir}/applications/fedora-gchemcalc-0.12.desktop
-%{_datadir}/applications/fedora-gchempaint-0.12.desktop
-%{_datadir}/applications/fedora-gchemtable-0.12.desktop
-%{_datadir}/applications/fedora-gcrystal-0.12.desktop
-%{_datadir}/applications/fedora-gspectrum-0.12.desktop
+%{_datadir}/applications/fedora-gchem3d-0.14.desktop
+%{_datadir}/applications/fedora-gchemcalc-0.14.desktop
+%{_datadir}/applications/fedora-gchempaint-0.14.desktop
+%{_datadir}/applications/fedora-gchemtable-0.14.desktop
+%{_datadir}/applications/fedora-gcrystal-0.14.desktop
+%{_datadir}/applications/fedora-gspectrum-0.14.desktop
%{_datadir}/gchemutils
%{_datadir}/glib-2.0/schemas/org.gnome.gchemutils.*
-%{_datadir}/gnome/help/gchem3d-0.12
-%{_datadir}/gnome/help/gchemcalc-0.12
-%{_datadir}/gnome/help/gchempaint-0.12
-%{_datadir}/gnome/help/gchemtable-0.12
-%{_datadir}/gnome/help/gcrystal-0.12
-%{_datadir}/gnome/help/gspectrum-0.12
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-gchempaint.png
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-gcrystal.png
-%{_mandir}/man1/gchem3d.1*
-%{_mandir}/man1/gchemcalc.1*
-%{_mandir}/man1/gchempaint.1*
-%{_mandir}/man1/gchemtable.1*
-%{_mandir}/man1/gcrystal.1*
-%{_mandir}/man1/gspectrum.1*
+%{_datadir}/gnome/help/gchem3d-0.14
+%{_datadir}/gnome/help/gchemcalc-0.14
+%{_datadir}/gnome/help/gchempaint-0.14
+%{_datadir}/gnome/help/gchemtable-0.14
+%{_datadir}/gnome/help/gcrystal-0.14
+%{_datadir}/gnome/help/gspectrum-0.14
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-gchempaint.svg
+%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-gcrystal.svg
+%{_mandir}/man1/gchem3d-unstable.1*
+%{_mandir}/man1/gchemcalc-unstable.1*
+%{_mandir}/man1/gchempaint-unstable.1*
+%{_mandir}/man1/gchemtable-unstable.1*
+%{_mandir}/man1/gcrystal-unstable.1*
+%{_mandir}/man1/gspectrum-unstable.1*
%{_datadir}/mime/packages/gchemutils.xml
-%{_datadir}/omf/gchem3d-0.12
-%{_datadir}/omf/gchemcalc-0.12
-%{_datadir}/omf/gchempaint-0.12
-%{_datadir}/omf/gchemtable-0.12
-%{_datadir}/omf/gcrystal-0.12
-%{_datadir}/omf/gspectrum-0.12
+%{_datadir}/omf/gchem3d-0.14
+%{_datadir}/omf/gchemcalc-0.14
+%{_datadir}/omf/gchempaint-0.14
+%{_datadir}/omf/gchemtable-0.14
+%{_datadir}/omf/gcrystal-0.14
+%{_datadir}/omf/gspectrum-0.14
%files gnumeric
-%defattr(-,root,root,-)
%{_libdir}/gnumeric/*/plugins/gchemutils
%files mozplugin
-%defattr(-,root,root,-)
%{_libdir}/mozilla/plugins/libmozgcu.so
%changelog
+* Sat Jan 07 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.13.5-1
+- Updated to 0.13.5
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- GConf2 is no more
+
* Fri Nov 11 2011 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.10-1
- Updated to 0.12.10
diff --git a/sources b/sources
index ce5f145..1e54bbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8695127b480f5779348ceccfdbb05e77 gnome-chemistry-utils-0.12.10.tar.xz
+c7c51041cfb9b3e105e5905daf5f8aac gnome-chemistry-utils-0.13.5.tar.xz
More information about the scm-commits
mailing list