diff --git a/.gitignore b/.gitignore index 98355b4..2c9e5c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libpano13-2.9.14.tar.gz /libpano13-2.9.17.tar.gz /libpano13-2.9.18.tar.gz +/libpano13-2.9.19.tar.gz diff --git a/libpano13.spec b/libpano13.spec index 630d24d..93b7c6f 100644 --- a/libpano13.spec +++ b/libpano13.spec @@ -1,12 +1,13 @@ Summary: Library for manipulating panoramic images Name: libpano13 -Version: 2.9.18 -Release: 12%{?dist} +Version: 2.9.19 +Release: 1%{?dist} License: GPLv2+ URL: http://panotools.sourceforge.net/ Group: Development/Libraries Source: http://downloads.sourceforge.net/panotools/%{name}-%{version}.tar.gz BuildRequires: libjpeg-devel, libtiff-devel, libpng-devel, zlib-devel +BuildRequires: cmake BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,18 +20,15 @@ restriction of 179 degrees to prevent stitching of hemispherical photographs. %package tools Summary: Tools that use the libpano13 library Group: Applications/Multimedia -Provides: libpano12-tools = 2.8.6-4 -Obsoletes: libpano12-tools < 2.8.6-4 Requires: %{name} = %{version}-%{release} %description tools -PTAInterpolate, interpolate between photos PTcrop, create cropped TIFF files from uncropped TIFF PTuncrop, create uncropped TIFF files from cropped TIFF PTtiffdump PTinfo PToptimizer, a command-line interface for control-point optimisation -PTblender, match colour histograms of overlappng TIFF files +PTblender, match colour histograms of overlapping TIFF files PTtiff2psd, convert TIFF files to PSD panoinfo, a tool for querying pano13 library capabilities PTmasker @@ -51,12 +49,13 @@ programs which will manipulate panoramas using the libpano13 library. %setup -q %build -%configure --disable-static -make %{?_smp_mflags} +%cmake . -DSUPPORT_JAVA_PROGRAMS=0 +make VERBOSE=1 %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -rm %{buildroot}/%{_libdir}/libpano13.la +rm %{buildroot}/%{_libdir}/libpano13.a +rm -rf %{buildroot}/usr/share/pano13 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -67,11 +66,11 @@ rm -rf %{buildroot} %files %defattr(-, root, root,-) %doc AUTHORS ChangeLog COPYING NEWS README README.linux -%{_libdir}/libpano13.so.2* +%{_libdir}/libpano13.so.3* %files tools %defattr(-, root, root,-) -%doc doc/Optimize.txt doc/stitch.txt +%doc doc/Optimize.txt doc/stitch.txt doc/PTblender.readme doc/PTmender.readme %{_bindir}/PTcrop %{_bindir}/PTtiffdump %{_bindir}/PTinfo @@ -93,6 +92,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libpano13.pc %changelog +* Thu Oct 16 2014 Bruno Postle - 2.9.19-1 +- Upstream release + * Sun Aug 17 2014 Fedora Release Engineering - 2.9.18-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index a112473..0534547 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c3a4fce8b6f1d79e395896ce5d8776e libpano13-2.9.18.tar.gz +1e4ce42f58a3f22c0a97d0b7a8e1dbb0 libpano13-2.9.19.tar.gz