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

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	.cvsignore gabedit.spec sources 
Added Files:
	gabedit-gl2ps.patch 
Log Message:
* Thu Sep 25 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.8-1
- updated to latest stable version (2.1.8)
- fixed build with gtk2-2.14
- use system gl2ps


gabedit-gl2ps.patch:

--- NEW FILE gabedit-gl2ps.patch ---
diff -up Gabedit218Src/Makefile.gl2ps Gabedit218Src/Makefile
--- Gabedit218Src/Makefile.gl2ps	2008-09-25 23:00:34.000000000 +0200
+++ Gabedit218Src/Makefile	2008-09-25 23:00:21.000000000 +0200
@@ -44,6 +44,8 @@ ifneq ($(external_gl2ps),1)
 GL2PS     = gl2ps/*.o
 OBJECTS  += $(GL2PS)
 SUBDIRS  += gl2ps
+else
+OBJECTS  += -lgl2ps
 endif
  
 TARGETS = all clean dep


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2008 09:40:00 -0000	1.3
+++ .cvsignore	25 Sep 2008 21:25:13 -0000	1.4
@@ -1 +1 @@
-GabeditSrc217.tar.gz
+Gabedit218Src.tar.gz


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gabedit.spec	13 Jun 2008 09:40:00 -0000	1.2
+++ gabedit.spec	25 Sep 2008 21:25:13 -0000	1.3
@@ -1,13 +1,14 @@
-%define version	2.1.7
-%define tarver	217
+%define version	2.1.8
+%define tarver	218
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
 Version:	%{version}
 Release:	1%{?dist}
-#Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/Gabedit%{tarver}Src.tar.gz
-Source0:	http://lasim.univ-lyon1.fr/perso/allouche/gabedit/GabeditSrc%{tarver}.tar.gz
+Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/Gabedit%{tarver}Src.tar.gz
+#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
@@ -15,6 +16,7 @@
 Group:		Applications/Engineering
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	desktop-file-utils
+BuildRequires:	gl2ps-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gtkglarea2-devel
 BuildRequires:	libGLU-devel
@@ -59,7 +61,8 @@
 (vibration, geometry convergence, rotation, contours, planes colorcoded).
 
 %prep
-%setup -q -n GabeditSrc%{tarver}
+%setup -q -n Gabedit%{tarver}Src
+%patch0 -p1 -b .gl2ps
 %patch1 -p1 -b .gtkgl
 %patch2 -p1
 # remove bundled pre-built binaries
@@ -68,6 +71,16 @@
 %{__rm} -r utils/InnosSetupScriptWin32
 %{__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"
@@ -111,6 +124,11 @@
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* Thu Sep 25 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.8-1
+- updated to latest stable version (2.1.8)
+- fixed build with gtk2-2.14
+- use system gl2ps
+
 * Fri Jun 13 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.7-1
 - updated to latest development version (2.1.7)
 - dropped obsolete patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2008 09:40:00 -0000	1.3
+++ sources	25 Sep 2008 21:25:13 -0000	1.4
@@ -1 +1 @@
-f77dbc90d92dc7f8fc4e52da58b53bac  GabeditSrc217.tar.gz
+d7cd7ff686773d608ce2bdc517eba2d4  Gabedit218Src.tar.gz