diff --git a/.gitignore b/.gitignore index f424d47..004f0d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libpasastro-1.0-svn.tar.xz /libpasastro-1.1-svn.tar.xz +/libpasastro-4360b2aac1762eb72f4154e47dd2b198986d4add.tar.gz diff --git a/libpasastro-1.0-fix-install.patch b/libpasastro-1.0-fix-install.patch deleted file mode 100644 index 4ddef86..0000000 --- a/libpasastro-1.0-fix-install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/install.sh 2015-12-18 10:26:19.000000000 +0100 -+++ b/install.sh 2015-12-18 17:59:12.971421640 +0100 -@@ -14,9 +14,9 @@ - install -m 755 -d $destdir/share/doc - install -m 755 -d $destdir/share/doc/libpasastro - --install -v -m 644 -s getdss/libpasgetdss.so.* $destdir/lib/ --install -v -m 644 -s plan404/libpasplan404.so.* $destdir/lib/ --install -v -m 644 -s wcs/libpaswcs.so.* $destdir/lib/ -+install -v -m 755 getdss/libpasgetdss.so.* $destdir/lib/ -+install -v -m 755 plan404/libpasplan404.so.* $destdir/lib/ -+install -v -m 755 wcs/libpaswcs.so.* $destdir/lib/ - install -v -m 644 changelog $destdir/share/doc/libpasastro/changelog - install -v -m 644 copyright $destdir/share/doc/libpasastro/copyright - diff --git a/libpasastro-1.1-nostrip.patch b/libpasastro-1.1-nostrip.patch new file mode 100644 index 0000000..37c71ac --- /dev/null +++ b/libpasastro-1.1-nostrip.patch @@ -0,0 +1,18 @@ +diff -U 3 -dHrN -- a/install.sh b/install.sh +--- a/install.sh 2019-10-24 11:01:14.000000000 +0200 ++++ b/install.sh 2019-10-24 20:04:36.706209140 +0200 +@@ -14,10 +14,10 @@ + install -m 755 -d $destdir/share/doc + install -m 755 -d $destdir/share/doc/libpasastro + +-install -v -m 644 -s getdss/libpasgetdss.so.* $destdir/lib/ +-install -v -m 644 -s plan404/libpasplan404.so.* $destdir/lib/ +-install -v -m 644 -s wcs/libpaswcs.so.* $destdir/lib/ +-install -v -m 644 -s raw/libpasraw.so.* $destdir/lib/ ++install -v -m 755 getdss/libpasgetdss.so.* $destdir/lib/ ++install -v -m 755 plan404/libpasplan404.so.* $destdir/lib/ ++install -v -m 755 wcs/libpaswcs.so.* $destdir/lib/ ++install -v -m 755 raw/libpasraw.so.* $destdir/lib/ + install -v -m 644 changelog $destdir/share/doc/libpasastro/changelog + install -v -m 644 copyright $destdir/share/doc/libpasastro/copyright + diff --git a/libpasastro.spec b/libpasastro.spec index 2133a4a..0c92aa6 100644 --- a/libpasastro.spec +++ b/libpasastro.spec @@ -1,20 +1,21 @@ +%global commit 4360b2aac1762eb72f4154e47dd2b198986d4add +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: libpasastro Version: 1.1 -Release: 7.20171110svn%{?dist} +Release: 8.20191024git%{shortcommit}%{?dist} Summary: Pascal interface for standard astronomy libraries License: GPLv2+ URL: http://sourceforge.net/projects/libpasastro/ -# Use the following commands to generate the tarball: -# svn export -r 20 svn://svn.code.sf.net/p/libpasastro/code/trunk libpasastro-1.1 -# tar -cJvf libpasastro-1.1-svn.tar.xz libpasastro-1.1 -Source0: %{name}-%{version}-svn.tar.xz +Source0: https://github.com/pchev/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -# Patch to fix stripping and permissions of library files +# Patch to fix stripping of library files # Since this is Fedora specific we don't ask upstream to include -Patch0: libpasastro-1.0-fix-install.patch +Patch0: libpasastro-1.1-nostrip.patch BuildRequires: gcc-c++ +BuildRequires: pkgconfig(libraw) Provides: bundled(wcstools) = 3.9.5 @@ -25,9 +26,10 @@ with standard astronomy libraries. libpasgetdss.so : Interface with GetDSS to work with DSS images. libpasplan404.so : Interface with Plan404 to compute planets position. libpaswcs.so : Interface with libwcs to work with FITS WCS. +libpasraw.so : Interface with libraw to decode camera raw files. %prep -%autosetup -p1 +%autosetup -n %{name}-%{commit} -p1 # fix library path in install.sh script on 64bit sed -i 's/\$destdir\/lib/\$destdir\/%{_lib}/g' ./install.sh @@ -39,17 +41,19 @@ make %{_smp_mflags} arch_flags="%{optflags}" %install make install PREFIX=%{buildroot}%{_prefix} -# Create symlinks to soname -ldconfig -n %{buildroot}%{_libdir} - - %files %doc %{_datadir}/doc/%{name}/ -%{_libdir}/libpas*.so.* +%{_libdir}/libpas*.so.1 +%{_libdir}/libpas*.so.%{version} %changelog +* Fri Oct 25 2019 Mattia Verga - 1.1-8.20191024git4360b2a +- Update to git 4360b2a +- Added libpasraw.so +- Need LibRaw-devel as Build Require + * Thu Jul 25 2019 Fedora Release Engineering - 1.1-7.20171110svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3c0b3c3..011ae4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpasastro-1.1-svn.tar.xz) = 872eae6f3b745f69219fce41c0d69a3a87f7a8e4d14b8b5f1a585e2ee1934037d7f1edb55040c9b215ec9fbf1c9e4fc5d70e26060e8bb487e9c0dca3456b6bee +SHA512 (libpasastro-4360b2aac1762eb72f4154e47dd2b198986d4add.tar.gz) = 30f73eb5e2265a8c910ca492bd493d7feac43cf5a8987f54e5fbf0c00ab05572745fd8f3143ea956bc6018a62f11d855b97406e31c1f956540afc70b234ee2e7