Compare commits

...

14 Commits

Author SHA1 Message Date
Mattia Verga
8cbd64d660 Rebuild 1.7.4 since it has never been released as an update for EPEL7 and now the build is DELETED 2020-02-10 14:48:20 +01:00
Mattia Verga
dc619ec82a Revert "Update to 1.7.7"
This reverts commit 6be3856df1.

Also 1.7.7 requires newer gcc version than in EPEL7
2020-02-10 14:42:22 +01:00
Mattia Verga
10df32096d Add libfftw3 to BR 2020-02-10 14:33:29 +01:00
Mattia Verga
6be3856df1 Update to 1.7.7 2020-02-10 14:27:26 +01:00
Mattia Verga
5ab61fb69b Revert "Update to 1.8.1"
This reverts commit 7830c28337, reversing
changes made to 4a67dfdea1.

1.8 branch requires gcc > 4.9
2020-02-10 14:16:26 +01:00
Mattia Verga
7830c28337 Update to 1.8.1 2020-02-10 13:58:26 +01:00
Mattia Verga
4a67dfdea1 Update to 1.7.4 with edits from Fedora master branch 2019-04-04 17:24:13 +02:00
Mattia Verga
0d135d375b Use libjpeg-devel call 2017-11-05 18:33:17 +01:00
Mattia Verga
c68954dbf1 Change BR and macros to cmake3 for EPEL branch 2017-11-05 18:20:35 +01:00
Mattia Verga
9579c5fa0f Merge branch 'master' into epel7 2017-11-05 18:18:43 +01:00
Christian Dersch
8636dc4cdd Merge branch 'master' into epel7 2017-03-13 12:40:12 +01:00
Christian Dersch
03bda526c4 Merge branch 'master' into epel7 2017-02-05 14:00:00 +01:00
Christian Dersch
fb98544238 Unified spec for Fedora and EPEL 2016-05-07 09:18:09 +02:00
Christian Dersch
8c406e89e3 Need libusbx-devel instead of libusb-devel on EPEL7 2014-12-21 18:03:00 +01:00
4 changed files with 21 additions and 54 deletions

2
.gitignore vendored
View File

@ -18,5 +18,3 @@ libindi0_0.6.tar.gz
/libindi_1.6.2.tar.gz /libindi_1.6.2.tar.gz
/libindi-1.7.2.tar.gz /libindi-1.7.2.tar.gz
/libindi-1.7.4.tar.gz /libindi-1.7.4.tar.gz
/libindi-1.7.7.tar.gz
/libindi-1.8.1.tar.gz

View File

@ -10,7 +10,7 @@ NEW=$NAME-$1
echo "Generating clean tar for $NAME" echo "Generating clean tar for $NAME"
echo "Unpack original tar" echo "Unpack original tar"
tar -xzf indi-$1.tar.gz tar -xzf v$1.tar.gz
echo "Packing new tar for $NAME" echo "Packing new tar for $NAME"
mv $ORIG/$NAME $NEW mv $ORIG/$NAME $NEW
cp -r $ORIG/cmake_modules $NEW/cmake_modules cp -r $ORIG/cmake_modules $NEW/cmake_modules

View File

@ -1,27 +1,26 @@
Name: libindi Name: libindi
Version: 1.8.1 Version: 1.7.4
Release: 2%{?dist} Release: 5%{?dist}
Summary: Instrument Neutral Distributed Interface Summary: Instrument Neutral Distributed Interface
License: LGPLv2+ and GPLv2+ License: LGPLv2+ and GPLv2+
# See COPYRIGHT file for a description of the licenses and files covered # See COPYRIGHT file for a description of the licenses and files covered
URL: http://www.indilib.org URL: http://www.indilib.org
Source0: libindi-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch0: libindi-uaccess.patch Patch0: libindi-uaccess.patch
# Generated from git checkout using libindi-generate-tarball.sh # Generated from git checkout using libindi-generate-tarball.sh
BuildRequires: cmake BuildRequires: cmake3
BuildRequires: libfli-devel BuildRequires: libfli-devel
BuildRequires: libjpeg-devel
BuildRequires: libnova-devel BuildRequires: libnova-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(cfitsio) BuildRequires: pkgconfig(cfitsio)
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(gsl)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
@ -36,13 +35,13 @@ data acquisition, monitoring, and a lot more.
%package devel %package devel
Summary: Libraries, includes, etc. used to develop an application with %{name} Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-static%{?_isa} = %{version}-%{release} Requires: %{name}-static%{?_isa} = %{version}-%{release}
%description devel %description devel
These are the header files needed to develop a %{name} application These are the header files needed to develop a %{name} application
%package libs %package libs
Summary: INDI shared libraries Summary: INDI shared libraries
@ -60,19 +59,21 @@ Static library needed to develop a %{name} application
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
# For Fedora we want to put udev rules in %{_udevrulesdir} # For Fedora we want to put udev rules in %%{_udevrulesdir}
sed -i 's|/lib/udev/rules.d|%{_udevrulesdir}|g' CMakeLists.txt sed -i 's|/lib/udev/rules.d|%{_udevrulesdir}|g' CMakeLists.txt
chmod -x drivers/telescope/lx200fs2.h chmod -x drivers/telescope/lx200fs2.h
chmod -x drivers/telescope/lx200fs2.cpp chmod -x drivers/telescope/lx200fs2.cpp
%build %build
%cmake . %cmake3 .
make VERBOSE=1 %{?_smp_mflags} make VERBOSE=1 %{?_smp_mflags}
%install %install
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
%ldconfig_scriptlets libs %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%license COPYING.BSD COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE %license COPYING.BSD COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE
@ -95,58 +96,26 @@ make install DESTDIR=%{buildroot}
%{_libdir}/*.a %{_libdir}/*.a
%changelog %changelog
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2 * Mon Feb 10 2020 Mattia Verga <mattia.verga@protonmail.com> - 1.7.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuild 1.7.4 since it has never been released as update
* Sun Oct 20 2019 Christian Dersch <lupinix@fedoraproject.org> - 1.8.1-1 * Thu Apr 04 2019 Mattia Verga <mattia.verga@protonmail.com> - 1.7.4-4.1
- new version - Update to 1.7.4 with patches from Fedora branch
* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.7.7-3
- Rebuilt for GSL 2.6.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Apr 28 2019 Christian Dersch <lupinix@mailbox.org> - 1.7.7-1
- new version
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 23 2019 Björn Esser <besser82@fedoraproject.org> - 1.7.4-3
- Append curdir to CMake invokation. (#1668512)
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.7.4-2
- Rebuild with fixed binutils
* Sun Jul 29 2018 Christian Dersch <lupinix@mailbox.org> - 1.7.4-1 * Sun Jul 29 2018 Christian Dersch <lupinix@mailbox.org> - 1.7.4-1
- new version - new version
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 21 2018 Sergio Pascual <sergiopr@fedoraproject.org> 1.7.2-2 * Thu Jun 21 2018 Sergio Pascual <sergiopr@fedoraproject.org> 1.7.2-2
- Patch udev rule to remove plugdev (bz #1577332) - Patch udev rule to remove plugdev (bz #1577332)
* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 1.7.2-1
- new version
* Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 1.6.2-3
- rebuilt for cfitsio 3.420 (so version bump)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 08 2018 Christian Dersch <lupinix@mailbox.org> - 1.6.2-1
- new version
* Mon Jan 08 2018 Christian Dersch <lupinix@mailbox.org> - 1.6.1-1
- new version
* Tue Jan 02 2018 Christian Dersch <lupinix@fedoraproject.org> - 1.6.0-1 * Tue Jan 02 2018 Christian Dersch <lupinix@fedoraproject.org> - 1.6.0-1
- new version - new version
- split shared libraries into -libs subpackage, to be multiarch clean - split shared libraries into -libs subpackage, to be multiarch clean
* Sun Nov 05 2017 Mattia Verga <mattia.verga@email.it> - 1.5.0-1.1
- Change BR and macros to cmake3 for EPEL branch
- Use libjpeg-devel call
* Sat Oct 07 2017 Christian Dersch <lupinix@mailbox.org> - 1.5.0-1 * Sat Oct 07 2017 Christian Dersch <lupinix@mailbox.org> - 1.5.0-1
- new version - new version

View File

@ -1 +1 @@
SHA512 (libindi-1.8.1.tar.gz) = adc6d5b88fa37e1104ee87f5c4c06a69f79f46a9fcccc03deb5b9761767ff33b01e8bb927b72aa5c2337655181c9eb484adffb91282aa7e8c820020c98276c2d SHA512 (libindi-1.7.4.tar.gz) = 7a30eed80ebb218b68bf94ba5ef1f1ca5a85bd3ce5a8ef1528b9dcfce05af1d2487a4eb8e48bc73580791dce165d49092bb07bd5d9dbba2f53c947ac5ced07a6