commit rasmol

Hello community, here is the log from the commit of package rasmol checked in at Sat Jan 12 03:24:10 CET 2008. -------- --- rasmol/rasmol.changes 2007-08-06 18:25:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/rasmol/rasmol.changes 2008-01-10 16:29:26.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Jan 10 16:27:03 CET 2008 - lmichnovic@suse.cz + +- fixed function which checks the endianity of machine + (*CBFlib_bigEndian.patch) + +------------------------------------------------------------------- +Wed Jan 9 15:46:11 CET 2008 - lmichnovic@suse.cz + +- update to version 2.7.4 +- needs static CFBlib library for compilation +- *CBFlib_rpmoptflags.patch fixes use of RPM_OPT_FLAGS for CBFlib +- *no_wget_CBFlib.patch skips manual download from Internet +- fixed 64bit compilation problem (*ia64.patch) +- patch *ia64.patch renamed to *64bit.patch + +------------------------------------------------------------------- Old: ---- RasMol_2_7_3_1_29Dec06.tar.bz2 RasMol_2.7.3.1-array.patch RasMol_2.7.3.1-decrement_var.patch RasMol_2.7.3.1-ia64.patch RasMol_2.7.3.1.patch New: ---- CBFlib_0.7.8.tar.bz2 RasMol_2.7.4-64bit.patch RasMol_2.7.4-array.patch RasMol_2.7.4-CBFlib_bigEndian.patch RasMol_2.7.4-CBFlib_rpmoptflags.patch RasMol_2.7.4-decrement_var.patch RasMol_2.7.4-no_wget_CBFlib.patch RasMol_2.7.4.patch RasMol_2.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rasmol.spec ++++++ --- /var/tmp/diff_new_pack.f31842/_old 2008-01-12 03:23:36.000000000 +0100 +++ /var/tmp/diff_new_pack.f31842/_new 2008-01-12 03:23:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package rasmol (Version 2.7.3.1) +# spec file for package rasmol (Version 2.7.4) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,20 +12,25 @@ Name: rasmol BuildRequires: xorg-x11 xorg-x11-devel -URL: http://www.bernstein-plus-sons.com/software/rasmol/ +Url: http://www.bernstein-plus-sons.com/software/rasmol/ License: Public Domain, Freeware Group: Productivity/Scientific/Chemistry Provides: RasMol -Autoreqprov: on -Version: 2.7.3.1 -Release: 82 +AutoReqProv: on +Version: 2.7.4 +Release: 1 Summary: Molecular Graphics Visualization Tool -Source: RasMol_2_7_3_1_29Dec06.tar.bz2 +Source: RasMol_2.7.4.tar.bz2 Source1: README_FIRST +Source2: CBFlib_0.7.8.tar.bz2 Patch: RasMol_%{version}.patch -Patch1: RasMol_%{version}-ia64.patch +Patch1: RasMol_%{version}-64bit.patch Patch2: RasMol_%{version}-array.patch Patch3: RasMol_%{version}-decrement_var.patch +# this patch ommit downloading CBFlib tarball which is copied from source2 +Patch4: RasMol_%{version}-no_wget_CBFlib.patch +Patch5: RasMol_%{version}-CBFlib_rpmoptflags.patch +Patch6: RasMol_%{version}-CBFlib_bigEndian.patch # upstream patches are history BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,20 +57,27 @@ %define _xorg7bin X11R6/bin %define _xorg7_mandir /usr/X11R6/man %endif + %prep -%setup -n RasMol_2_7_3_1_RU_29Dec06 +%setup -n RasMol_2.7.4 -b2 %patch %patch1 %patch2 %patch3 +%patch4 +%patch5 +%patch6 cp %{S:1} . +## these thing were done manualy when repacking the 2.7.4 tarball +## may be reused in future # fixing executable flag -find . -type f -perm -111|xargs chmod -x -find . -name *.csh|xargs chmod +x +#find . -type f -perm -111|xargs chmod -x +#find . -name *.csh|xargs chmod +x # removing forgotten manpage link -rm -f src/rasmol.man +#rm -f src/rasmol.man %build +# export CFLAGS=$RPM_OPT_FLAGS have to be set in Makefile (patch 0 and 5) cd src xmkmf -a make @@ -88,6 +100,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 10 2008 - lmichnovic@suse.cz +- fixed function which checks the endianity of machine + (*CBFlib_bigEndian.patch) +* Wed Jan 09 2008 - lmichnovic@suse.cz +- update to version 2.7.4 +- needs static CFBlib library for compilation +- *CBFlib_rpmoptflags.patch fixes use of RPM_OPT_FLAGS for CBFlib +- *no_wget_CBFlib.patch skips manual download from Internet +- fixed 64bit compilation problem (*ia64.patch) +- patch *ia64.patch renamed to *64bit.patch * Mon Aug 06 2007 - lmichnovic@suse.cz - installing file README_FIRST * Mon Aug 06 2007 - lmichnovic@suse.cz ++++++ RasMol_2.7.4-64bit.patch ++++++ --- src/multiple.c +++ src/multiple.c @@ -199,6 +199,7 @@ #include #endif +#include #include #include #include --- src/pixutils.c +++ src/pixutils.c @@ -141,9 +141,7 @@ #include #endif #endif -#ifdef sun386 #include -#endif #include #include --- src/wbrotate.c +++ src/wbrotate.c @@ -154,6 +154,7 @@ #endif #include #include +#include #define WBROTATE #include "molecule.h" --- src/infile.c +++ src/infile.c @@ -124,8 +124,12 @@ Prelininary 2.7.2 build */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include "rasmol.h" +#include #ifdef IBMPC #include ++++++ RasMol_2.7.3.1-array.patch -> RasMol_2.7.4-array.patch ++++++ --- rasmol/RasMol_2.7.3.1-array.patch 2006-11-08 18:11:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/rasmol/RasMol_2.7.4-array.patch 2008-01-09 13:05:15.000000000 +0100 @@ -1,6 +1,6 @@ --- src/multiple.c +++ src/multiple.c -@@ -508,6 +508,7 @@ +@@ -605,6 +605,7 @@ char buf[MAX_MOLNAME], *s; save = MoleculeIndex; @@ -8,13 +8,12 @@ for (i = 0; i < NumMolecules; i++) { SwitchMolecule (i); #ifdef DirChar -@@ -525,8 +526,8 @@ +@@ -622,8 +623,8 @@ } else { sprintf(buf, "%d. %s", i+1, s); } -- MolName[i][MAX_MOLNAME]='\0'; -- strncpy(MolName[i],buf,MAX_MOLNAME-1); -+ strncpy(MolName[i],buf,MAX_MOLNAME-1); +- MolName[i][MAX_MOLNAME-1]='\0'; + strncpy(MolName[i],buf,MAX_MOLNAME-1); + MolName[i][MAX_MOLNAME-1]='\0'; MolNStr[i] = &(MolName[i][0]); MolNLen[i] = strlen(MolName[i]); ++++++ RasMol_2.7.4-CBFlib_bigEndian.patch ++++++ --- ../CBFlib_0.7.8/src/cbf_codes.c +++ ../CBFlib_0.7.8/src/cbf_codes.c @@ -795,7 +819,7 @@ { long tmp = 1; - return !((char *)(&tmp)); + return !(*(char *)(&tmp)); } void cbf_endianFix(char *str, size_t size, int fromEndian, int toEndian) ++++++ RasMol_2.7.4-CBFlib_rpmoptflags.patch ++++++ --- ../CBFlib_0.7.8/Makefile +++ ../CBFlib_0.7.8/Makefile @@ -313,7 +313,7 @@ ######################################################### CC = gcc C++ = g++ -CFLAGS = -g -O2 -Wall -ansi -pedantic +CFLAGS = -g -O2 -Wall -ansi -pedantic $(RPM_OPT_FLAGS) F90C = gfortran F90FLAGS = -g F90LDFLAGS = ++++++ RasMol_2.7.3.1-decrement_var.patch -> RasMol_2.7.4-decrement_var.patch ++++++ --- rasmol/RasMol_2.7.3.1-decrement_var.patch 2007-01-29 12:54:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/rasmol/RasMol_2.7.4-decrement_var.patch 2008-01-09 13:05:15.000000000 +0100 @@ -1,6 +1,6 @@ --- src/transfor.c +++ src/transfor.c -@@ -1588,6 +1588,11 @@ +@@ -1632,6 +1632,11 @@ for( i=0; i ../doc/rasmol.1 $(CBFLIBDIR): - (cd $(CBFLIB_TARBALLDIR);\ - wget $(CBFLIB_TARBALL_URL);\ - gunzip < $(CBFLIB_TARBALL) | tar xvf -) + (cd $(CBFLIB_TARBALLDIR);) $(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR) (cd $(CBFLIBDIR); make lib/libcbf.a) ++++++ RasMol_2.7.3.1-array.patch -> RasMol_2.7.4.patch ++++++ --- rasmol/RasMol_2.7.3.1-array.patch 2006-11-08 18:11:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/rasmol/RasMol_2.7.4.patch 2008-01-10 16:18:25.000000000 +0100 @@ -1,21 +1,34 @@ ---- src/multiple.c -+++ src/multiple.c -@@ -508,6 +508,7 @@ - char buf[MAX_MOLNAME], *s; +--- src/Imakefile ++++ src/Imakefile +@@ -154,7 +154,9 @@ + # with #define + # - save = MoleculeIndex; -+ if (NumMolecules > MAX_MOLECULES) NumMolecules = MAX_MOLECULES; - for (i = 0; i < NumMolecules; i++) { - SwitchMolecule (i); - #ifdef DirChar -@@ -525,8 +526,8 @@ - } else { - sprintf(buf, "%d. %s", i+1, s); - } -- MolName[i][MAX_MOLNAME]='\0'; -- strncpy(MolName[i],buf,MAX_MOLNAME-1); -+ strncpy(MolName[i],buf,MAX_MOLNAME-1); -+ MolName[i][MAX_MOLNAME-1]='\0'; - MolNStr[i] = &(MolName[i][0]); - MolNLen[i] = strlen(MolName[i]); - } +-#ifdef HPArchitecture ++CCOPTIONS = $(RPM_OPT_FLAGS) ++ ++#if defined(HPArchitecture) && !defined(LinuxArchitecture) + CCOPTIONS = -Ae + CDEBUGFLAGS = +O2 +Onolimit + +@@ -186,8 +188,6 @@ + ComplexProgramTarget(rasmol) + MakeDirectories(install,$(RASMOLDIR)) + InstallNonExec(../doc/rasmol.hlp,$(RASMOLDIR)) +-InstallNonExec(../data/1crn.pdb,$(RASMOLDIR)) +-InstallNonExec(../data/3cro.pdb,$(RASMOLDIR)) + + rasmol.man:: ../doc/rasmol.1 + ln -s ../doc/rasmol.1 rasmol.man +--- src/cif_ctonum.c ++++ src/cif_ctonum.c +@@ -183,7 +183,9 @@ + extern "C" { + #endif + ++#ifndef _USE_RASMOL_H_ + #define _USE_RASMOL_H_ ++#endif + #ifdef _USE_RASMOL_H_ + #include "rasmol.h" + #else ++++++ RasMol_2_7_3_1_29Dec06.tar.bz2 -> RasMol_2.7.4.tar.bz2 ++++++ rasmol/RasMol_2_7_3_1_29Dec06.tar.bz2 /mounts/work_src_done/STABLE/rasmol/RasMol_2.7.4.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org