rpms/chemtool/devel .cvsignore, 1.4, 1.5 chemtool-compile.patch, 1.2, 1.3 chemtool.spec, 1.9, 1.10 sources, 1.4, 1.5

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/chemtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9947

Modified Files:
	.cvsignore chemtool-compile.patch chemtool.spec sources 
Log Message:
* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
- updated to 1.6.12
- dropped obsolete patch hunks
- moved gtk-update-icon-cache to posttrans scriptlet



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2007 20:13:27 -0000	1.4
+++ .cvsignore	22 Aug 2009 12:31:54 -0000	1.5
@@ -1 +1 @@
-chemtool-1.6.11.tar.gz
+chemtool-1.6.12.tar.gz

chemtool-compile.patch:
 cht-2.5.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Index: chemtool-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/chemtool-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chemtool-compile.patch	26 Aug 2007 20:13:27 -0000	1.2
+++ chemtool-compile.patch	22 Aug 2009 12:31:54 -0000	1.3
@@ -1,16 +1,6 @@
---- chemtool-1.6.11/Makefile.in.compile	2007-08-26 13:53:59.000000000 +0200
-+++ chemtool-1.6.11/Makefile.in	2007-08-26 20:37:00.000000000 +0200
-@@ -230,7 +230,7 @@ chemtool_SOURCES = main.c draw.c graph.c
- AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
- 
- # Link time dependencies.
--LDADD = @LIBINTL@ @GTK_LIBS@
-+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
- 
- # Additional files to be distributed.
- EXTRA_DIST = autogen.sh autoclean.sh
---- chemtool-1.6.11/src-cht/cht-2.5.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/src-cht/cht-2.5.c	2007-08-26 20:30:25.000000000 +0200
+diff -up chemtool-1.6.12/src-cht/cht-2.5.c.compile chemtool-1.6.12/src-cht/cht-2.5.c
+--- chemtool-1.6.12/src-cht/cht-2.5.c.compile	2007-11-10 22:12:35.000000000 +0100
++++ chemtool-1.6.12/src-cht/cht-2.5.c	2009-08-22 13:49:26.000000000 +0200
 @@ -121,11 +121,6 @@
  #define LACK_MEMMOVE
  #define LACK_MEMCPY
@@ -80,14 +70,3 @@
  
  int my_toupper(c)
  int c;
---- chemtool-1.6.11/inout.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/inout.c	2007-08-26 20:30:25.000000000 +0200
-@@ -13,7 +13,7 @@
- #include "gdk/gdkprivate.h"
- #include <locale.h>
- #ifdef EMF
--#include <emf.h>
-+#include <libEMF/emf.h>
- #endif
- #ifdef DISABLE_NLS
- #define _(Text) Text


Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/chemtool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- chemtool.spec	24 Jul 2009 18:53:20 -0000	1.9
+++ chemtool.spec	22 Aug 2009 12:31:54 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A program for 2D drawing organic molecules
 Name: chemtool
-Version: 1.6.11
-Release: 5%{?dist}
+Version: 1.6.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
@@ -64,13 +64,17 @@ desktop-file-install --vendor=fedora \
 %find_lang %{name}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
 %clean
@@ -88,6 +92,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
+- updated to 1.6.12
+- dropped obsolete patch hunks
+- moved gtk-update-icon-cache to posttrans scriptlet
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2007 20:13:27 -0000	1.4
+++ sources	22 Aug 2009 12:31:54 -0000	1.5
@@ -1 +1 @@
-25c15b2ee73fc89b4e34cafd57daca31  chemtool-1.6.11.tar.gz
+f9e0633cbda09fcfe5a4ea4c56bcd460  chemtool-1.6.12.tar.gz