rpms/seaview/devel seaview-chris.patch,1.4,1.5 seaview.spec,1.9,1.10
Christian Iseli
c4chris at fedoraproject.org
Fri Jan 8 18:13:19 UTC 2010
Author: c4chris
Update of /cvs/pkgs/rpms/seaview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25978
Modified Files:
seaview-chris.patch seaview.spec
Log Message:
New upstream version 4.2.1.
seaview-chris.patch:
Makefile | 9 +++++----
seaview.cxx | 3 ++-
use_mase_files.cxx | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
Index: seaview-chris.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview-chris.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- seaview-chris.patch 26 Feb 2009 22:35:08 -0000 1.4
+++ seaview-chris.patch 8 Jan 2010 18:13:18 -0000 1.5
@@ -1,22 +1,23 @@
-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\"
+diff -up seaview/Makefile.chris seaview/Makefile
+--- seaview/Makefile.chris 2009-05-26 23:35:00.000000000 +0200
++++ seaview/Makefile 2010-01-08 19:01:35.279746382 +0100
+@@ -1,6 +1,6 @@
+ #For Debian compilation, uncomment the 2 lines below
+-#HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\"
-#PHYMLNAME= -DPHYMLNAME=\"phyml\"
--EXTRALIBS= -lXft -lXinerama
--STATIC= -Xlinker -Bstatic
--DYNAMIC= -Xlinker -Bdynamic
-+HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
++HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\"
+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++
+ #to compile with PDF (through PDFlib Lite) rather than PostScript output,
+@@ -23,13 +23,14 @@ PDF_PS = postscript
+ #to use with FLTK without libXft, comment out the next line
+ USE_XFT = -DUSE_XFT -I/usr/include/freetype2
+
+-EXTRALIBS= -lXft -lXext -ljpeg -lpng $(LPDF)
++EXTRALIBS= -lXft -lXext $(LPDF)
+
+ CXX = g++
CSRC = csrc
#DEBUG = -g
@@ -24,39 +25,30 @@ diff -up seaview-4.0/Makefile.chris seav
+#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
+OPT = $(RPM_OPT_FLAGS)
- 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
+ CFLAGS = $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
- 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) {
+diff -up seaview/seaview.cxx.chris seaview/seaview.cxx
+--- seaview/seaview.cxx.chris 2010-01-08 19:06:38.821913203 +0100
++++ seaview/seaview.cxx 2010-01-08 19:06:59.651787543 +0100
+@@ -3906,7 +3906,8 @@ if(doing_dnd) {
}
if( clipboard_contains_alignment(clipboard) ) {
- char **seqs, **seqnames, **comments, *p, *message;
+ char **seqs, **seqnames, **comments, *message;
-+ const char *p;
++ const char *p;
int i, count, num, changedwname = FALSE;
- p = strchr(clipboard, ':') + 1;
+ p = (char*)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" {
+diff -up seaview/use_mase_files.cxx.chris seaview/use_mase_files.cxx
+--- seaview/use_mase_files.cxx.chris 2010-01-04 15:03:28.000000000 +0100
++++ seaview/use_mase_files.cxx 2010-01-08 19:05:14.618421352 +0100
+@@ -1543,7 +1543,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) {
+ if((p = (char*)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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- seaview.spec 27 Jul 2009 04:06:48 -0000 1.9
+++ seaview.spec 8 Jan 2010 18:13:19 -0000 1.10
@@ -1,12 +1,12 @@
Name: seaview
-Version: 4.0
-Release: 2%{?dist}
+Version: 4.2.1
+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_4.0.tar.gz
+Source0: ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_4.2.1.tar.gz
Source1: seaview.desktop
Patch0: seaview-chris.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ alignment.
%prep
-%setup -q
+%setup -q -n seaview
%patch0 -p 1 -b .chris
@@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/seaview
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 seaview $RPM_BUILD_ROOT/%{_bindir}
-install -m 644 seaview.help $RPM_BUILD_ROOT%{_datadir}/seaview/
+install -m 644 seaview.html $RPM_BUILD_ROOT%{_datadir}/seaview/
desktop-file-install \
--vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 8 2010 Christian Iseli <Christian.Iseli at licr.org> - 4.2.1-1
+- New upstream version
+- tarball does not expand to a versioned directory
+- seaview.help -> seaview.html
+- resync patches
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list