Merge branch 'master' into epel7

.gitignore

@@ -10,3 +10,5 @@ libindi0_0.6.tar.gz
 /libindi_1.1.0.tar.gz
 /libindi_1.2.0.tar.gz
 /libindi-1.3.1.tar.gz
+/libindi_1.4.0.tar.gz
+/libindi_1.4.1.tar.gz

libindi-generate-tarball.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Starting with release 1.3 INDI ships libindi and 3rdparty stuff (with nonfree
-# BLOBs) in one big tar archive. Thus we have to generate a clean one for
-# Fedora containing only the free library itself.
-
-VERSION=$1
-ORIG=indi-$1
-NEW=libindi-$1
-
-echo "Generating clean tar for libindi $1"
-echo "Unpack original tar"
-tar -xzf $ORIG.tar.gz
-mv $ORIG/libindi $NEW
-cp -r $ORIG/cmake_modules $NEW/cmake_modules
-tar -cpzf $NEW.tar.gz $NEW
-echo "Clean up"
-rm -rf $ORIG $NEW
-echo "Done! Generated $NEW.tar.gz"

libindi.spec

@@ -1,18 +1,13 @@
 Name: libindi
-Version: 1.3.1
+Version: 1.4.1
 Release: 1%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
-Group: Development/Libraries
 License: LGPLv2+ and GPLv2+
 # See COPYRIGHT file for a description of the licenses and files covered
 
 URL: http://www.indilib.org
-# Grab the release tar from https://github.com/indilib/indi/releases
-# and execute ./libindi-generate-tarball.sh 1.3.1
-# to generate a clean tar containing only the free library
-Source0:       %{name}-%{version}.tar.gz
-Source1:       %{name}-generate-tarball.sh
+Source0:       https://github.com/indilib/indi/releases/download/v%{version}/%{name}_%{version}.tar.gz
 
 BuildRequires: cmake 
 BuildRequires: cfitsio-devel
@@ -51,7 +46,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Static library needed to develop a %{name} application
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 # For Fedora we want to put udev rules in %{_udevrulesdir}
 sed -i 's|/lib/udev/rules.d|%{_udevrulesdir}|g' CMakeLists.txt
 chmod -x drivers/telescope/lx200fs2.h
@@ -86,6 +81,15 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Mon Feb 27 2017 Christian Dersch <lupinix@mailbox.org> - 1.4.1-1
+- new version
+
+* Sun Feb 26 2017 Christian Dersch <lupinix@mailbox.org> - 1.4.0-1
+- new version
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Dec 15 2016 derschc <lupinix@mailbox.org> - 1.3.1-1
 - new version
 

sources

@@ -1 +1 @@
-SHA512 (libindi-1.3.1.tar.gz) = 2ccc171ed192631c1004380ad12abc244cfecee717143d764f461531829afe9adce5aa4ad4890bf1a874cbf63b4fe322b94761aa597850abd84a40346715e51c
+SHA512 (libindi_1.4.1.tar.gz) = b1655070fbc71095215a06edc88b8fff247ed3dcab86c2af058978b209e48ce1701f3a6eef13d0b200be58abfcfdffe7800ecea35d820fc2fb158ea0f899833f