SPECS: hugin.spec - merged from DEVEL

qboosh qboosh at pld-linux.org
Tue Oct 7 22:36:36 CEST 2008


Author: qboosh                       Date: Tue Oct  7 20:36:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   hugin.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/hugin.spec
diff -u SPECS/hugin.spec:1.35 SPECS/hugin.spec:1.36
--- SPECS/hugin.spec:1.35	Tue Sep  9 22:26:04 2008
+++ SPECS/hugin.spec	Tue Oct  7 22:36:31 2008
@@ -1,43 +1,38 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	pano13			# use libpano13 instead of libpano12
-#
-%define		_beta	beta4
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
 Version:	0.7.0
-Release:	0.rc5.0.1
+Release:	1
 License:	GPL v2+
-Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}_rc5.tar.gz
-# Source0-md5:	cd99ce8985aec47b93e300c2be695680
+Group:		X11/Applications/Graphics
+Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
+# Source0-md5:	6efbfc72ceba028ca3dff3c23806a7f3
 Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-asneeded.patch
 Patch2:		%{name}-cppflags.patch
 URL:		http://hugin.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
+BuildRequires:	OpenEXR-devel
 BuildRequires:	boost-devel >= 1.35.0
+BuildRequires:	cmake >= 2.4
+BuildRequires:	exiv2-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 1:2.0.3
 BuildRequires:	libjpeg-devel
-%{!?with_pano13:BuildRequires:	libpano12-devel >= 2.8.1}
-%{?with_pano13:BuildRequires:	libpano13-devel}
+BuildRequires:	libpano13-devel >= 2.9.12
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.471
 BuildRequires:	sed >= 4.0
 BuildRequires:	wxGTK2-unicode-devel >= 2.6.0
 BuildRequires:	zip
 BuildRequires:	zlib-devel
-%{!?with_pano13:BuildConflicts:	libpano13-devel}
-%{!?with_pano13:Requires:	libpano12 >= 2.8.1}
-%{?with_pano13:Requires:	libpano13}
-Suggests:	autopano-sift
-Suggests:	enblend >= 2.4
+Suggests:	autopano-sift-C >= 2.5.0
+Suggests:	enblend-enfuse >= 3.1
+# exiftool program
+Suggests:	perl-Image-ExifTool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,69 +40,86 @@
 immensive panorama, stitch any series of overlapping pictures and much
 more.
 
-Note: Hugin can use autopano-sift package to match images and enblend
-package for soft blending, so you'll probably want to install them
-too.
+Note: Hugin can use autopano-sift-C package to match images and
+enblend package for soft blending, so you'll probably want to install
+them too.
 
 %description -l pl.UTF-8
 Przy użyciu hugina można połączyć wiele fotografii w kompletną, dużą
 panoramę, skleić dowolny ciąg nakładających się zdjęć i wiele więcej.
 
-Hugin może używać pakietu autopano-sift do dopasowania zdjęć oraz
+Hugin może używać pakietu autopano-sift-C do dopasowania zdjęć oraz
 pakiet enblend do wygładzenia krawędzi po łączeniu - więc warto te
 pakiety także zainstalować.
 
 %prep
-%setup -q 
-# %%patch0 -p1
+%setup -q
+%patch0 -p1
 %patch1 -p1
-%patch2
+%patch2 -p0
 
-#sed -i -e 's/ca_ES/ca/;s/cs_CZ/cs/;' src/hugin/po/LINGUAS
 mv -f src/translations/{ca_ES,ca}.po
 mv -f src/translations/{cs_CZ,cs}.po
-# missing in LINGUAS
-# echo 'cs'>> src/nona_gui/po/LINGUAS
 
 %build
 install -d build
 cd build
+%cmake .. \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-gtk2-unicode-config
 
-export CPPFLAGS="%{rpmcppflags}"  
-%cmake \
-	-DCMAKE_BUILD_TYPE:STRING="None" \
-	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-gtk2-ansi-config \
-	..
-%{__make} VERBOSE=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	gnomemimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-# "hugin" and "nona_gui" domains
-%find_lang %{name} --all-name
+# cmake is so great there is no way to pass proper path
+mv $RPM_BUILD_ROOT%{_iconsdir}/{gnome,hicolor}
+
+# not needed
+rm $RPM_BUILD_ROOT%{_libdir}/libhugin*.so
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog LICENCE_JHEAD LICENCE_VIGRA NEWS README TODO
+%doc AUTHORS ChangeLog LICENCE_JHEAD LICENCE_VIGRA README TODO
+%lang(ja) %doc README_JP
+%attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
-%attr(755,root,root) %{_bindir}/color_correct_tiff
 %attr(755,root,root) %{_bindir}/fulla
 %attr(755,root,root) %{_bindir}/hugin
+%attr(755,root,root) %{_bindir}/hugin_hdrmerge
+%attr(755,root,root) %{_bindir}/hugin_stitch_project
+%attr(755,root,root) %{_bindir}/matchpoint
 %attr(755,root,root) %{_bindir}/nona
 %attr(755,root,root) %{_bindir}/nona_gui
-%attr(755,root,root) %{_bindir}/zhang_undistort
+%attr(755,root,root) %{_bindir}/pto2mk
+%attr(755,root,root) %{_bindir}/tca_correct
+%attr(755,root,root) %{_bindir}/vig_optimize
+%attr(755,root,root) %{_libdir}/libhuginANN.so.*.*
+%attr(755,root,root) %{_libdir}/libhuginbase.so.*.*
+%attr(755,root,root) %{_libdir}/libhuginjhead.so.*.*
+%attr(755,root,root) %{_libdir}/libhuginvigraimpex.so.*.*
 %{_datadir}/%{name}
 %{_datadir}/mime/packages/hugin.xml
 %{_desktopdir}/hugin.desktop
-%{_iconsdir}/hicolor/*/mimetypes/*.png
+%{_desktopdir}/hugin_stitch_project.desktop
+%{_iconsdir}/hicolor/*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
 %{_pixmapsdir}/hugin.png
 %{_mandir}/man1/fulla.1*
 
@@ -117,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2008/10/07 20:36:31  qboosh
+- merged from DEVEL
+
 Revision 1.35  2008/09/09 20:26:04  draenog
 - start update to 0.7.0rc5; project switched from autotools to cmake
 - pl.po-update.patch needs updating
@@ -126,6 +141,38 @@
 
 Revision 1.34  2008/08/21 12:08:15  hawk
 - release 4
+
+Revision 1.33.2.10  2008/10/07 20:31:47  qboosh
+- rc6 became final 0.7.0
+
+Revision 1.33.2.9  2008/09/16 05:52:31  qboosh
+- updated to 0.7.0_rc6
+- updated pl.po-update patch
+
+Revision 1.33.2.8  2008/09/12 16:08:34  qboosh
+- S =~ s/enblend/enblend-enfuse/
+
+Revision 1.33.2.7  2008/09/10 17:56:30  qboosh
+- updated pl.po-update patch is back
+
+Revision 1.33.2.6  2008/09/10 14:29:12  qboosh
+- updated files
+
+Revision 1.33.2.5  2008/09/09 21:11:31  qboosh
+- previous "0.7.0 release" appeared to be -rc1; updated to -rc5 now
+- merged asneeded,cppflags patches from HEAD
+
+Revision 1.33.2.4  2008/07/31 17:57:53  qboosh
+- ugh, one more lib64 mistake
+
+Revision 1.33.2.3  2008/07/31 17:50:13  qboosh
+- macros for cmake (with LDFLAGS support)
+
+Revision 1.33.2.2  2008/07/31 15:30:41  qboosh
+- oops, typo
+
+Revision 1.33.2.1  2008/07/31 04:54:51  qboosh
+- started update to 0.7.0 (still fighting with cmake); needs cvs enblend
 
 Revision 1.33  2008/05/12 13:47:12  shadzik
 - rel .3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hugin.spec?r1=1.35&r2=1.36&f=u



More information about the pld-cvs-commit mailing list