c4chris pushed to seaview (f22). "New upstream version (..more)"

[notifications at fedoraproject.org]

From 65b2391fa43b84e7fda8d563bf8ae3be3a691552 Mon Sep 17 00:00:00 2001
From: Christian Iseli <Christian.Iseli at isb-sib.ch>
Date: Mon, 18 May 2015 14:40:52 +0200
Subject: New upstream version

- Fix FTBFS bugzilla 1222300

diff --git a/.gitignore b/.gitignore
index 9a20b7c..8a770ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ seaview_4.2.6.tar.gz
 /seaview_4.4.0.tar.gz
 /seaview_4.5.0.tar.gz
 /seaview_4.5.2.tar.gz
+/seaview_4.5.4.tar.gz
+/seaview_4.5.4.4.tar.gz
diff --git a/seaview-chris.patch b/seaview-chris.patch
index c278d2e..55cef38 100644
--- a/seaview-chris.patch
+++ b/seaview-chris.patch
@@ -1,6 +1,6 @@
 diff -up seaview/Makefile.chris seaview/Makefile
---- seaview/Makefile.chris	2014-04-01 15:15:36.000000000 +0200
-+++ seaview/Makefile	2014-04-08 09:25:42.763760960 +0200
+--- seaview/Makefile.chris	2015-03-14 07:15:57.000000000 +0100
++++ seaview/Makefile	2015-05-18 14:29:54.480355766 +0200
 @@ -1,6 +1,6 @@
  #For Debian compilation, uncomment the 2 lines below 
 -#HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/doc/seaview/seaview.html\"
@@ -10,21 +10,21 @@ diff -up seaview/Makefile.chris seaview/Makefile
  
  
  #to compile with PDF (through PDFlib Lite) rather than PostScript output, 
-@@ -17,14 +17,15 @@ FLTK = /usr/include
- #IFLTK = -I$(FLTK)
- #LFLTK = -L$(FLTK)/lib
+@@ -21,7 +21,7 @@
+ CONFIG ?= fltk-config
+ PDF_PS_FLAGS ?= -DNO_PDF
  
--EXTRALIBS = -lXft -lXext -lfontconfig -ljpeg -lpng -lXinerama $(LPDF) -ldl
-+EXTRALIBS = -lXft -lfontconfig -lXinerama $(LPDF) -ldl
+-EXTRALIBS = `$(CONFIG) --use-images --ldflags`
++EXTRALIBS = `$(CONFIG) --use-images --ldflags` -lpthread -lz
  
  CC = gcc
  CXX = g++
- CSRC = csrc
- 
+@@ -30,7 +30,7 @@ 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)
- EXTRA = -DFl_Native_File_Chooser=mgFl_Native_File_Chooser
+ #OPT = -O0
+ 
+-OPT ?= -O3
++OPT ?= $(RPM_OPT_FLAGS)
+ 
+ SVFLAGS = $(CPPFLAGS) $(CFLAGS) -Dunix $(OPT) -I. $(IFLTK) -I$(CSRC) $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
  
- SVFLAGS = -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS) $(EXTRA)
diff --git a/seaview.spec b/seaview.spec
index 5b01224..1b7f266 100644
--- a/seaview.spec
+++ b/seaview.spec
@@ -1,12 +1,12 @@
 Name:           seaview
-Version:        4.5.2
-Release:        3%{?dist}
+Version:        4.5.4.4
+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.5.2.tar.gz
+Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_4.5.4.4.tar.gz
 Source1:        seaview.desktop
 Patch0:         seaview-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 18 2015 Christian Iseli <Christian.Iseli at unil.ch> - 4.5.4.4-1
+- New upstream version
+- Fix FTBFS bugzilla 1222300
+
 * Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-3
 - rebuild (fltk)
 
diff --git a/sources b/sources
index be9c7d7..181613e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8b693c7cabc7fe1afb733f1f0161e18  seaview_4.5.2.tar.gz
+359f45dd94c4894c5479a1c66742296b  seaview_4.5.4.4.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/seaview.git/commit/?h=f22&id=65b2391fa43b84e7fda8d563bf8ae3be3a691552