smani pushed to xflr5 (master). "Update to 6.10.04"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 13 15:55:38 UTC 2015


>From cba83a15857873058fa73ad055425cad934a201f Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Mon, 13 Apr 2015 17:54:35 +0200
Subject: Update to 6.10.04


diff --git a/.gitignore b/.gitignore
index 9647413..7e24583 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /xflr5-6.09-05.tar.bz2
 /xflr5-6.09-06.tar.gz
 /xflr5-6.10.02.tar.gz
+/xflr5-code-701-tags-v6.10.04.zip
diff --git a/sources b/sources
index e0e536f..1180bc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66901cd0cc4bae1308b6bdad937b4645  xflr5-6.10.02.tar.gz
+f8d848f307e79572c157d968aed5dd72  xflr5-code-701-tags-v6.10.04.zip
diff --git a/xflr5.spec b/xflr5.spec
index 6ca91df..f0e87d5 100644
--- a/xflr5.spec
+++ b/xflr5.spec
@@ -1,20 +1,19 @@
+%global rev 701
+
 Name:           xflr5
-Version:        6.10.02
-Release:        4%{?dist}
+Version:        6.10.04
+Release:        1%{?dist}
 Summary:        Analysis tool for airfoils, wings and planes
 
 License:        GPLv2+
 URL:            http://www.xflr5.com/
-# There appears to be no published source tarball to download
-# Instead, the source must be checked out from svn:
-#  svn co http://svn.code.sf.net/p/xflr5/code/branches/xflr5-%%{ver}/
-#  rm -rf xflr5-%%{ver}/.svn
-#  tar cjf xflr5-%%{ver}.tar.bz2 xflr5-%%{ver}/
-Source0:        http://sourceforge.net/projects/%{name}/files/v%{version}/%{name}-%{version}.tar.gz
+# The published tarballs are incomplete (i.e. doc/ folder missing)
+Source0:        http://sourceforge.net/code-snapshots/svn/x/xf/xflr5/code/%{name}-code-%{rev}-tags-v%{version}.zip
 Source1:        %{name}.desktop
 
 BuildRequires:  dos2unix
-BuildRequires:  qt4-devel
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qttools-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  texlive-scheme-basic
 BuildRequires:  tex(inputenc.sty)
@@ -41,8 +40,7 @@ Reynolds Numbers. It includes:
 
 
 %prep
-%setup -q -n %{name}-%(v=%{version}; echo ${v%.*})
-find . -type d -name .svn -print0 | xargs -0 rm -r
+%setup -q -n %{name}-code-%{rev}-tags-v%{version}
 
 # Fix FSF addresses
 find . -type f -print0 | xargs -0 sed -i 's|59 Temple Place, Suite 330, Boston, MA  02111-1307|51 Franklin Street, Fifth Floor, Boston, MA  02110-1301|'
@@ -51,10 +49,10 @@ find . -type f -print0 | xargs -0 sed -i 's|59 Temple Place, Suite 330, Boston,
 find . -type f -exec dos2unix {} \;
 
 %build
-%qmake_qt4 PREFIX=%{_prefix} DEFINES='APPLICATION_DATA_DIR=\\\"%{_datadir}/%{name}\\\"' %{name}_%(v=%{version}; echo ${v%.*}).pro
+%qmake_qt5 PREFIX=%{_prefix} DEFINES='APPLICATION_DATA_DIR=\\\"%{_datadir}/%{name}\\\"' %{name}_%(v=%{version}; echo ${v%.*}).pro
 make %{?_smp_mflags}
 make -C doc/latex
-lrelease-qt4 translations/*.ts
+lrelease-qt5 translations/*.ts
 
 # Delete the translations template
 rm translations/xflr5v6.qm
@@ -89,7 +87,8 @@ fi
 
 
 %files
-%doc License.txt doc/ReleaseNotes.txt
+%doc doc/ReleaseNotes.txt
+%license License.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -98,6 +97,9 @@ fi
 
 
 %changelog
+* Mon Apr 13 2015 Sandro Mani <manisandro at gmail.com> - 6.10.04-1
+- Update to 6.10.04
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.10.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xflr5.git/commit/?h=master&id=cba83a15857873058fa73ad055425cad934a201f


More information about the scm-commits mailing list