[seaview] New upstream version, and fix for failed mass-rebuild.

Christian Iseli c4chris at fedoraproject.org
Mon Jan 16 15:12:03 UTC 2012 

commit 8cfb94fa89cee61fbba6559f443cf71ebf6ca341
Author: Christian Iseli <Christian.Iseli at licr.org>
Date:   Mon Jan 16 16:11:50 2012 +0100

    New upstream version, and fix for failed mass-rebuild.

 .gitignore          |    1 +
 seaview-chris.patch |   35 ++++++++++++++---------------------
 seaview.spec        |   16 +++++++++++-----
 sources             |    2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66c61a1..84d68eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 seaview_4.2.6.tar.gz
 /seaview_4.2.12.tar.gz
+/seaview_4.3.2.tar.gz
diff --git a/seaview-chris.patch b/seaview-chris.patch
index 640bfc5..e2503e6 100644
--- a/seaview-chris.patch
+++ b/seaview-chris.patch
@@ -1,22 +1,23 @@
 diff -up seaview/Makefile.chris seaview/Makefile
---- seaview/Makefile.chris	2010-10-25 09:58:36.000000000 +0200
-+++ seaview/Makefile	2011-05-27 17:54:25.037968879 +0200
+--- seaview/Makefile.chris	2011-11-30 14:39:34.000000000 +0100
++++ seaview/Makefile	2012-01-16 15:43:55.216981184 +0100
 @@ -1,6 +1,6 @@
  #For Debian compilation, uncomment the 2 lines below 
--#HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\"
+-#HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/doc/seaview/seaview.html\"
 -#PHYMLNAME= -DPHYMLNAME=\"phyml\"
-+HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\"
++HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/doc/seaview-4.3.2/seaview.html\"
 +PHYMLNAME= -DPHYMLNAME=\"phyml\"
  
  
  #to compile with PDF (through PDFlib Lite) rather than PostScript output, 
-@@ -23,13 +23,14 @@ PDF_PS = postscript
+@@ -27,14 +27,15 @@ else echo 'Fl_Native_File_Chooser_FLTK';
  #to use with FLTK without libXft, comment out the next line
  USE_XFT = -DUSE_XFT -I/usr/include/freetype2
  
--EXTRALIBS= -lXft -lXext -lfontconfig -ljpeg -lpng $(LPDF)
-+EXTRALIBS= -lXft -lXext -lfontconfig $(LPDF)
+-EXTRALIBS= -lXft -lXext -lfontconfig -ljpeg -lpng -lXinerama $(LPDF)
++EXTRALIBS= -lXft -lfontconfig -lXinerama $(LPDF)
  
+ CC = gcc
  CXX = g++
  CSRC = csrc
  
@@ -28,17 +29,9 @@ diff -up seaview/Makefile.chris seaview/Makefile
  CFLAGS  = $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
  
 diff -up seaview/seaview.cxx.chris seaview/seaview.cxx
---- seaview/seaview.cxx.chris	2011-03-11 17:24:57.000000000 +0100
-+++ seaview/seaview.cxx	2011-05-27 18:05:21.830144449 +0200
-@@ -61,6 +61,7 @@
- 		added File:Save prot alignmnt
- */
- 
-+#define FL_INTERNALS 1
- #include "seaview.h"
- #include <string.h>
- #include <stdio.h>
-@@ -3939,7 +3940,8 @@ if(doing_dnd) {
+--- seaview/seaview.cxx.chris	2011-12-06 16:54:28.000000000 +0100
++++ seaview/seaview.cxx	2012-01-16 15:39:58.922410548 +0100
+@@ -3978,7 +3978,8 @@ if(doing_dnd) {
  }
  
  if( clipboard_contains_alignment(clipboard) ) {
@@ -49,9 +42,9 @@ diff -up seaview/seaview.cxx.chris seaview/seaview.cxx
  	p = (char*)strchr(clipboard, ':') + 1;
  	count = read_mase_seqs_header(p, &seqs, &seqnames, 
 diff -up seaview/use_mase_files.cxx.chris seaview/use_mase_files.cxx
---- seaview/use_mase_files.cxx.chris	2010-04-02 23:02:00.000000000 +0200
-+++ seaview/use_mase_files.cxx	2011-05-27 17:54:25.038968923 +0200
-@@ -1543,7 +1543,7 @@ extern "C" { 
+--- seaview/use_mase_files.cxx.chris	2011-11-27 10:06:15.000000000 +0100
++++ seaview/use_mase_files.cxx	2012-01-16 15:39:58.994409502 +0100
+@@ -1543,7 +1543,7 @@ extern "C" {
  static char seaview_prog_dir[200] = "";
  void inform_prog_dir(const char *arg0)
  {
diff --git a/seaview.spec b/seaview.spec
index 5c942c1..cc3eea4 100644
--- a/seaview.spec
+++ b/seaview.spec
@@ -1,17 +1,18 @@
 Name:           seaview
-Version:        4.2.12
-Release:        2%{?dist}
+Version:        4.3.2
+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.2.12.tar.gz
+Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_4.3.2.tar.gz
 Source1:        seaview.desktop
 Patch0:         seaview-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  fltk-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  libXinerama-devel
 
 %description
 SeaView is a graphical multiple sequence alignment editor developed by Manolo
@@ -41,7 +42,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/seaview
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -m 755 seaview $RPM_BUILD_ROOT/%{_bindir}
-install -m 644 seaview.html $RPM_BUILD_ROOT%{_datadir}/seaview/
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc seaview.1.xml example.nxs
+%doc seaview.1.xml seaview.html
 %{_bindir}/seaview
 %{_datadir}/seaview/
 %{_datadir}/applications/*%{name}.desktop
@@ -66,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 16 2012 Christian Iseli <Christian.Iseli at unil.ch> - 4.3.2-1
+- New upstream version
+- Fix for failed mass rebuild: removed -lXext at link step
+- put seaview.html in doc
+- example file has disappeared
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 72ebf04..bb1181c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59055f1173490d71a7b36c5d036b9fca  seaview_4.2.12.tar.gz
+d8b87a19d9cc4ee89478d647a6454fb2  seaview_4.3.2.tar.gz

More information about the scm-commits mailing list