|
@@ -1,6 +1,6 @@
|
|
|
%define pkg_name xyscan
|
|
|
-%define pkg_version 3.3.0
|
|
|
-%define pkg_version_s 3.30
|
|
|
+%define pkg_version 4.2.1
|
|
|
+%define pkg_version_s 4.21
|
|
|
%define pkg_release 1%{?_dist_release}
|
|
|
|
|
|
Summary: A data thief for scientist
|
|
@@ -11,18 +11,23 @@ Release: %{pkg_release}
|
|
|
License: GPLv3 or later
|
|
|
Group: Applications/Edutainment
|
|
|
URL: http://rhig.physics.yale.edu/~ullrich/software/xyscan/
|
|
|
-Source0: http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/%{pkg_version_s}/%{name}-%{pkg_version_s}-src.tar.gz
|
|
|
+Source0: http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/%{pkg_version_s}/%{name}-%{pkg_version_s}-src.tgz
|
|
|
Source1: xyscan.desktop
|
|
|
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
-BuildRequires: qt4-devel >= 4.6
|
|
|
-Requires: qt4 >= 4.6
|
|
|
+BuildRequires: qt5-qtbase-devel
|
|
|
+BuildRequires: qt5-qtmultimedia-devel
|
|
|
+BuildRequires: poppler-qt5-devel
|
|
|
+Requires: qt5-qtbase
|
|
|
+Requires: qt5-qtmultimedia
|
|
|
+Requires: poppler-qt5
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: ara_t
|
|
|
|
|
|
+
|
|
|
%description
|
|
|
xyscan is a tool for scientists in need to extract values of data points
|
|
|
from a plot that is available in electronic format. It can handle plots
|
|
@@ -36,22 +41,16 @@ numeric values from any kind of 2D technical drawings.
|
|
|
%setup -q -n %{name}
|
|
|
|
|
|
%build
|
|
|
-qmake -o Makefile xyscan.pro
|
|
|
+qmake-qt5 xyscan.pro INCPATH="%{_includedir}/poppler/qt5"
|
|
|
+%{__perl} -pi -e 's|/usr/local/bin/|/usr/bin/|g' Makefile
|
|
|
+%{__perl} -pi -e 's|/usr/local/share/|/usr/share/|g' Makefile
|
|
|
%{__make} %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
|
|
|
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_libdir}/%{name}-%{version}
|
|
|
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications
|
|
|
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/icons
|
|
|
-
|
|
|
-%{__cp} xyscan ${RPM_BUILD_ROOT}%{_libdir}/%{name}-%{version}
|
|
|
-%{__cp} -r docs ${RPM_BUILD_ROOT}%{_libdir}/%{name}-%{version}
|
|
|
-
|
|
|
-echo "%{_libdir}/%{name}-%{version}/%{name} $*" \
|
|
|
- > ${RPM_BUILD_ROOT}%{_bindir}/xyscan
|
|
|
-%{__chmod} +x ${RPM_BUILD_ROOT}%{_bindir}/xyscan
|
|
|
+%{__make} install INSTALL_ROOT=${RPM_BUILD_ROOT}
|
|
|
|
|
|
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications/
|
|
|
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/icons/
|
|
|
%{__cp} -a %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/
|
|
|
%{__cp} images/xyscanIcon.png ${RPM_BUILD_ROOT}%{_datadir}/icons/
|
|
|
|
|
@@ -61,14 +60,18 @@ echo "%{_libdir}/%{name}-%{version}/%{name} $*" \
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc gpl.txt license.txt
|
|
|
+%doc license.txt
|
|
|
%{_bindir}/xyscan
|
|
|
-%{_libdir}/xyscan-%{version}/
|
|
|
+# %{_libdir}/xyscan-%{version}/
|
|
|
%{_datadir}/applications/xyscan.desktop
|
|
|
%{_datadir}/icons/xyscanIcon.png
|
|
|
+%{_datadir}/xyscan/
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Dec 02 2017 Toshiaki Ara <ara_t@384.jp> 4.2.1-1
|
|
|
+- update to 4.2.1 for VineSeed
|
|
|
+
|
|
|
* Sat Jul 30 2016 Toshiaki Ara <ara_t@384.jp> 3.3.0-1
|
|
|
- new package
|
|
|
|