rpms/seaview/devel .cvsignore, 1.4, 1.5 seaview-chris.patch, 1.3, 1.4 seaview.spec, 1.6, 1.7 sources, 1.4, 1.5
Christian Iseli
c4chris at fedoraproject.org
Thu Feb 26 22:35:38 UTC 2009
Author: c4chris
Update of /cvs/pkgs/rpms/seaview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2406
Modified Files:
.cvsignore seaview-chris.patch seaview.spec sources
Log Message:
New upstream version. Fix GCC 4.4 compile issues.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 12 Jun 2008 21:53:49 -0000 1.4
+++ .cvsignore 26 Feb 2009 22:35:07 -0000 1.5
@@ -1 +1 @@
-seaview_2.4.tar.gz
+seaview_4.0.tar.gz
seaview-chris.patch:
Index: seaview-chris.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview-chris.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seaview-chris.patch 12 Jun 2008 22:23:44 -0000 1.3
+++ seaview-chris.patch 26 Feb 2009 22:35:08 -0000 1.4
@@ -1,53 +1,62 @@
-diff -up seaview-2.4/Makefile.chris seaview-2.4/Makefile
---- seaview-2.4/Makefile.chris 2007-11-13 10:30:26.000000000 +0100
-+++ seaview-2.4/Makefile 2008-06-13 00:12:14.000000000 +0200
-@@ -3,26 +3,27 @@
- #seaviewps does not use the PDFLibLite library and outputs postscript
-
- #customize these next 3 lines
--FLTK = ../fltk-1.1.6
--PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
--X11 = /usr/X11R6
-+#FLTK = ../fltk-1.1.6
-+#PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
-+#X11 = /usr/X11R6
-
- #comment out and customize next line to set helpfile name at compile-time
--#HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/bge/mgouy/seaview/seaview.help\"
-+HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
-
- CXX = g++
- CC = gcc
-
--OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
--
--STDCFLAGS = -Dunix -c $(OPT) -I$(FLTK) -I$(X11)/include $(DEBUG) $(HELP_NOT_IN_PATH)
--
--CFLAGS = $(STDCFLAGS) -I$(PDF)
--PDFLIBS = -L$(PDF) -lpdf
-+#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
+diff -up seaview-4.0/Makefile.chris seaview-4.0/Makefile
+--- seaview-4.0/Makefile.chris 2009-02-26 23:06:41.000000000 +0100
++++ seaview-4.0/Makefile 2009-02-26 23:16:08.000000000 +0100
+@@ -1,9 +1,9 @@
+ #For Debian compilation, uncomment the 2 lines below and comment out the next 3 lines
+-#HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
+-#PHYMLNAME= -DPHYMLNAME=\"phyml\"
+-EXTRALIBS= -lXft -lXinerama
+-STATIC= -Xlinker -Bstatic
+-DYNAMIC= -Xlinker -Bdynamic
++HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
++PHYMLNAME= -DPHYMLNAME=\"phyml\"
++#EXTRALIBS= -lXft -lXinerama
++#STATIC= -Xlinker -Bstatic
++#DYNAMIC= -Xlinker -Bdynamic
+
+
+ #FLTK = -I$(HOME)/Documents/fltk/fltk-1.1.9
+@@ -12,7 +12,8 @@ CXX = g++
+ CSRC = csrc
+
+ #DEBUG = -g
+-OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
++#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
+OPT = $(RPM_OPT_FLAGS)
-+
-+STDCFLAGS = -Dunix -c $(OPT) $(DEBUG) $(HELP_NOT_IN_PATH)
-+
-+CFLAGS = $(STDCFLAGS) -DNO_PDF
-+#PDFLIBS = -L$(PDF) -lpdf
-
-
- #conditional macros
--seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF
-+#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF
-
-
- OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o viewasprots.o misc_acnuc.o
-@@ -38,8 +39,8 @@ seaview : seaview.o $(OBJECTS) pdf.o
-
- seaviewps : seaview.o $(OBJECTS) postscript.o
- $(CXX) $(DEBUG) seaview.o $(OBJECTS) postscript.o \
-- -L$(FLTK)/lib -lfltk \
-- -L$(X11)/lib -lX11 \
-+ -lfltk \
-+ -lX11 \
- -o seaview \
- -lm
+ CFLAGS = -DNO_PDF -DFLTK1 -Dunix $(OPT) $(FLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME)
+
+@@ -26,7 +27,7 @@ bionj.o phyml_util.o pseudoterminal.o po
+
+ seaview : seaview.cxx $(OBJECTS)
+ $(CXX) -o $@ $(DEBUG) $(CFLAGS) seaview.cxx $(OBJECTS) \
+- $(STATIC) -lfltk_images -lfltk -ljpeg -lpng $(DYNAMIC) \
++ $(STATIC) -lfltk_images -lfltk $(DYNAMIC) \
+ $(EXTRALIBS) \
+ -lX11 -lm -lz
+
+diff -up seaview-4.0/seaview.cxx.chris seaview-4.0/seaview.cxx
+--- seaview-4.0/seaview.cxx.chris 2009-02-26 23:11:06.000000000 +0100
++++ seaview-4.0/seaview.cxx 2009-02-26 23:11:56.000000000 +0100
+@@ -3900,7 +3900,8 @@ if(doing_dnd) {
+ }
+
+ if( clipboard_contains_alignment(clipboard) ) {
+- char **seqs, **seqnames, **comments, *p, *message;
++ char **seqs, **seqnames, **comments, *message;
++ const char *p;
+ int i, count, num, changedwname = FALSE;
+ p = strchr(clipboard, ':') + 1;
+ count = read_mase_seqs_header(p, &seqs, &seqnames,
+diff -up seaview-4.0/use_mase_files.cxx.chris seaview-4.0/use_mase_files.cxx
+--- seaview-4.0/use_mase_files.cxx.chris 2009-02-26 23:10:06.000000000 +0100
++++ seaview-4.0/use_mase_files.cxx 2009-02-26 23:10:34.000000000 +0100
+@@ -1502,7 +1502,7 @@ extern "C" {
+ static char seaview_prog_dir[200] = "";
+ void inform_prog_dir(const char *arg0)
+ {
+-char *p;
++const char *p;
+ if((p = strrchr(arg0, '/')) != NULL) {
+ memcpy(seaview_prog_dir, arg0, p - arg0 + 1);
+ seaview_prog_dir[p - arg0 + 1] = 0;
Index: seaview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- seaview.spec 26 Feb 2009 00:20:17 -0000 1.6
+++ seaview.spec 26 Feb 2009 22:35:08 -0000 1.7
@@ -1,12 +1,12 @@
Name: seaview
-Version: 2.4
-Release: 2%{?dist}
+Version: 4.0
+Release: 1%{?dist}
Summary: Graphical multiple sequence alignment editor
Group: Applications/Engineering
License: GPLv2+
URL: http://pbil.univ-lyon1.fr/software/seaview.html
-Source0: ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_2.4.tar.gz
+Source0: ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_4.0.tar.gz
Source1: seaview.desktop
Patch0: seaview-chris.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,12 +22,12 @@
%prep
-%setup -q -c
+%setup -q
%patch0 -p 1 -b .chris
%build
-make %{?_smp_mflags} seaviewps
+make %{?_smp_mflags}
%check
@@ -61,6 +61,10 @@
%changelog
+* Thu Feb 26 2009 Christian Iseli <Christian.Iseli at licr.org> - 4.0-1
+- New upstream version
+- Fix GCC 4.4 compile issues
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Jun 2008 21:53:49 -0000 1.4
+++ sources 26 Feb 2009 22:35:08 -0000 1.5
@@ -1 +1 @@
-a8ffc65aca2454e1f959fe9c6179c9b1 seaview_2.4.tar.gz
+d48e9c0c4f75998b13b2a376dede9d9a seaview_4.0.tar.gz
More information about the fedora-extras-commits
mailing list