rpms/gabedit/devel .cvsignore, 1.4, 1.5 gabedit.spec, 1.4, 1.5 sources, 1.4, 1.5 gabedit-gl2ps.patch, 1.1, NONE gabedit-gtkgl.patch, 1.2, NONE

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	.cvsignore gabedit.spec sources 
Removed Files:
	gabedit-gl2ps.patch gabedit-gtkgl.patch 
Log Message:
* Thu Feb 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.1.17-1
- updated to latest development version (2.1.17)
- dropped obsolete patches
- use new icon cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2008 21:25:13 -0000	1.4
+++ .cvsignore	27 Feb 2009 01:26:26 -0000	1.5
@@ -1 +1 @@
-Gabedit218Src.tar.gz
+GabeditSrc2117.tar.gz


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gabedit.spec	24 Feb 2009 19:12:17 -0000	1.4
+++ gabedit.spec	27 Feb 2009 01:26:26 -0000	1.5
@@ -1,15 +1,12 @@
-%define version	2.1.8
-%define tarver	218
+%define version	2.1.17
+%define tarver	2117
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
 Version:	%{version}
-Release:	2%{?dist}
-Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/Gabedit%{tarver}Src.tar.gz
-#Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
+Release:	1%{?dist}
+Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		%{name}-gl2ps.patch
-Patch1:		%{name}-gtkgl.patch
 Patch2:		%{name}-csh.patch
 URL:		http://gabedit.sourceforge.net/home.html
 License:	MIT
@@ -61,9 +58,7 @@
 (vibration, geometry convergence, rotation, contours, planes colorcoded).
 
 %prep
-%setup -q -n Gabedit%{tarver}Src
-%patch0 -p1 -b .gl2ps
-%patch1 -p1 -b .gtkgl
+%setup -q -n GabeditSrc%{tarver}
 %patch2 -p1
 # remove bundled pre-built binaries
 %{__rm} utils/MolecularMechanics/{createTPLfile,createmmfile}
@@ -72,15 +67,6 @@
 %{__rm} utils/Others/Gabedit206.iss
 echo "external_gtkglarea=1" >> CONFIG
 echo "external_gl2ps=1" >> CONFIG
-# replace deprecated stuff dropped in 2.14
-# it's either this or a 0.5MB patch
-sed -i \
- -e 's/GtkSignalFunc/GCallback/g' \
- -e 's/GTK_SIGNAL_FUNC/G_CALLBACK/g' \
- -e 's/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/g' \
- -e 's/GTK_CHECK_TYPE/G_TYPE_CHECK_INSTANCE_TYPE/g' \
- -e 's/GtkDestroyNotify/GDestroyNotify/g' \
- `find -name "*.c" -o -name "*.h"`
 
 %build
 %{__make} %{?_smp_mflags} COMMONCFLAGS="$RPM_OPT_FLAGS"
@@ -105,15 +91,15 @@
 rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_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
 
 %files
@@ -124,6 +110,11 @@
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* Thu Feb 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.1.17-1
+- updated to latest development version (2.1.17)
+- dropped obsolete patches
+- use new icon cache scriptlets
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2008 21:25:13 -0000	1.4
+++ sources	27 Feb 2009 01:26:26 -0000	1.5
@@ -1 +1 @@
-d7cd7ff686773d608ce2bdc517eba2d4  Gabedit218Src.tar.gz
+cd013b995134720cc9e1821d71b7ba5f  GabeditSrc2117.tar.gz


--- gabedit-gl2ps.patch DELETED ---


--- gabedit-gtkgl.patch DELETED ---