rpms/gabedit/devel .cvsignore, 1.2, 1.3 gabedit-gtkgl.patch, 1.1, 1.2 gabedit.spec, 1.1, 1.2 sources, 1.2, 1.3 gabedit-Makefiles.patch, 1.1, NONE

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/gabedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32584

Modified Files:
	.cvsignore gabedit-gtkgl.patch gabedit.spec sources 
Removed Files:
	gabedit-Makefiles.patch 
Log Message:
- updated to latest development version (2.1.7)
- dropped obsolete patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 May 2008 20:43:19 -0000	1.2
+++ .cvsignore	13 Jun 2008 09:40:00 -0000	1.3
@@ -1 +1 @@
-Gabedit214Src.tar.gz
+GabeditSrc217.tar.gz

gabedit-gtkgl.patch:

Index: gabedit-gtkgl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit-gtkgl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gabedit-gtkgl.patch	30 May 2008 20:43:19 -0000	1.1
+++ gabedit-gtkgl.patch	13 Jun 2008 09:40:00 -0000	1.2
@@ -1,18 +1,12 @@
-diff -up Gabedit214Src/Makefile.gtkgl Gabedit214Src/Makefile
---- Gabedit214Src/Makefile.gtkgl	2008-04-01 13:44:25.000000000 +0200
-+++ Gabedit214Src/Makefile	2008-04-28 13:00:39.000000000 +0200
-@@ -1,4 +1,4 @@
--GTKGL      = gtkglarea/*.o
-+GTKGL      = `pkg-config --libs gtkgl-2.0`
- COMMON     = src/Common/*.o
- FILES      = src/Files/*.o
- GAUSS      = src/Gaussian/*.o
-@@ -21,7 +21,7 @@ MULTIGRID     = src/MultiGrid/*.o
+diff -up GabeditSrc217/Makefile.gtkgl GabeditSrc217/Makefile
+--- GabeditSrc217/Makefile.gtkgl	2008-06-09 18:24:52.000000000 +0200
++++ GabeditSrc217/Makefile	2008-06-13 11:30:36.000000000 +0200
+@@ -36,6 +36,8 @@ ifneq ($(external_gtkglarea),1)
+ GTKGL     = gtkglarea/*.o
+ OBJECTS  += $(GTKGL)
+ SUBDIRS  += gtkglarea
++else
++OBJECTS  += -lgtkgl-2.0
+ endif
  
- include CONFIG
-  
--SUBDIRS = gtkglarea src/OpenGL src/Common src/Files src/Gaussian \
-+SUBDIRS = src/OpenGL src/Common src/Files src/Gaussian \
- 	src/Geometry src/Spectrum src/MolecularMechanics src/Molpro src/Molcas \
- 	src/MPQC src/Gamess src/QChem src/Mopac src/NetWork src/Utils src/Symmetry \
- 	src/PCGamess src/MultiGrid
+ ifneq ($(external_gl2ps),1)


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gabedit.spec	30 May 2008 20:43:19 -0000	1.1
+++ gabedit.spec	13 Jun 2008 09:40:00 -0000	1.2
@@ -1,13 +1,13 @@
-%define version	2.1.4
-%define tarver	214
+%define version	2.1.7
+%define tarver	217
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
 Version:	%{version}
-Release:	2%{?dist}
-Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/Gabedit%{tarver}Src.tar.gz
+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
 Source1:	%{name}.desktop
-Patch0:		%{name}-Makefiles.patch
 Patch1:		%{name}-gtkgl.patch
 Patch2:		%{name}-csh.patch
 URL:		http://gabedit.sourceforge.net/home.html
@@ -59,19 +59,18 @@
 (vibration, geometry convergence, rotation, contours, planes colorcoded).
 
 %prep
-%setup -q -n Gabedit%{tarver}Src
-%patch0 -p1 -b .M
+%setup -q -n GabeditSrc%{tarver}
 %patch1 -p1 -b .gtkgl
 %patch2 -p1
 # remove bundled pre-built binaries
 %{__rm} utils/MolecularMechanics/{createTPLfile,createmmfile}
-%{__rm} utils/Others/{addInclude,addVirgul,createH}
 # remove Win32-specific files
 %{__rm} -r utils/InnosSetupScriptWin32
 %{__rm} utils/Others/Gabedit206.iss
+echo "external_gtkglarea=1" >> CONFIG
 
 %build
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags} COMMONCFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf %{buildroot}
@@ -112,6 +111,10 @@
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* 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
+
 * Mon May 19 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.4-2
 - standardized SourceForge source URL
 - made _smp_flags usage optional


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2008 20:43:19 -0000	1.2
+++ sources	13 Jun 2008 09:40:00 -0000	1.3
@@ -1 +1 @@
-8f5b4422c46a9cf24fa6b974ca271c1f  Gabedit214Src.tar.gz
+f77dbc90d92dc7f8fc4e52da58b53bac  GabeditSrc217.tar.gz


--- gabedit-Makefiles.patch DELETED ---