diff --git a/hugin-2011.0.0.tar.bz2 b/hugin-2011.0.0.tar.bz2 deleted file mode 100644 index 232aa1a..0000000 --- a/hugin-2011.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc -size 11439430 diff --git a/hugin-2011.4.0.tar.bz2 b/hugin-2011.4.0.tar.bz2 new file mode 100644 index 0000000..bdc3dce --- /dev/null +++ b/hugin-2011.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae +size 11740410 diff --git a/hugin.changes b/hugin.changes index 782f79b..f76103c 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Dec 22 06:39:12 UTC 2011 - mrdocs@opensuse.org + +-Updated to version 2011.4.0: + * numerous translation updates + * bug fixes + * new pto-gen tool + * build system fixes + +------------------------------------------------------------------- +Fri Oct 21 04:40:46 UTC 2011 - tony@daylessday.org + +- Fixed build on openSUSE 11.3. + +------------------------------------------------------------------- +Thu Oct 20 14:05:44 UTC 2011 - tony@daylessday.org + +- Updated to version 2011.2.0: + * New Python scripting interface. + * New lens calibration tool + * A critical bug affecting a significant number of Mac users has been fixed. + * Many general improvements have been made. + +------------------------------------------------------------------- +Tue Oct 4 18:27:07 UTC 2011 - coolo@suse.com + +- disable parallel build and enable verbose compilne + ------------------------------------------------------------------- Tue May 31 16:34:47 CEST 2011 - sbrabec@suse.cz @@ -32,7 +60,7 @@ Tue Apr 26 19:34:14 CEST 2011 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Mar 22 08:12:00 UTC 2011 - idoenmez@novell.com -- Add hugin-fix-gcc46.patch: fix gcc 4.6 compilation +- Add hugin-fix-gcc46.patch: fix gcc 4.6 compilation ------------------------------------------------------------------- Mon Mar 21 16:51:59 UTC 2011 - coolo@novell.com @@ -61,9 +89,9 @@ Thu Apr 8 11:46:35 CEST 2010 - pgajdos@suse.cz - Updated to version 2010.0.0: * Fix storage of image cache upperbound. * Set response type to linear when adding hdr images. - * Set blender and fusion options to default value when user + * Set blender and fusion options to default value when user entered an empty string. - * Fixes update of preview window when projection parameter + * Fixes update of preview window when projection parameter changed. * etc. see ChangeLog. @@ -116,7 +144,7 @@ Tue Jun 9 11:56:59 CEST 2009 - coolo@novell.com ------------------------------------------------------------------- Wed May 27 02:07:54 CEST 2009 - ro@suse.de -- fix build with gcc-4.4 +- fix build with gcc-4.4 ------------------------------------------------------------------- Tue Oct 7 17:42:37 CEST 2008 - sbrabec@suse.cz @@ -219,7 +247,7 @@ Mon Jul 16 18:48:54 CEST 2007 - sbrabec@suse.cz ------------------------------------------------------------------- Wed May 9 16:59:33 CEST 2007 - pgajdos@suse.cz -- removed gnome-icon-theme from BuildRequires [#247450] +- removed gnome-icon-theme from BuildRequires [#247450] ------------------------------------------------------------------- Tue Jan 30 14:03:16 CET 2007 - sbrabec@suse.cz @@ -229,7 +257,7 @@ Tue Jan 30 14:03:16 CET 2007 - sbrabec@suse.cz ------------------------------------------------------------------- Fri Jan 26 01:45:26 CET 2007 - ro@suse.de -- accept gettext 0.16 ... +- accept gettext 0.16 ... ------------------------------------------------------------------- Sat Oct 21 13:21:34 CEST 2006 - schwab@suse.de @@ -258,7 +286,7 @@ Thu Aug 17 19:10:04 CEST 2006 - postadal@suse.cz * multithreaded remapping for hugin and nona * support for dcraw 16 bit .ppm files * disabled PTOptimizer progress display on OSX - * added tool fulla (see man pages), for distortion, TCA and vignetting + * added tool fulla (see man pages), for distortion, TCA and vignetting correction (can use old version PTLens database) * added Czech translation - removed obsoleted patches: hugin-xqual.patch, filedialog-close-crash.patch @@ -301,12 +329,12 @@ Thu Jan 12 13:02:13 CET 2006 - sbrabec@suse.cz ------------------------------------------------------------------- Tue Nov 8 01:58:09 CET 2005 - ro@suse.de -- remove some extra qualifications to fix build with gcc-4.1 +- remove some extra qualifications to fix build with gcc-4.1 ------------------------------------------------------------------- Tue Oct 25 15:37:15 CEST 2005 - yxu@suse.de -- fixed missing part of function +- fixed missing part of function ------------------------------------------------------------------- Thu Sep 22 16:11:32 CEST 2005 - sbrabec@suse.cz @@ -372,7 +400,7 @@ Wed Dec 22 17:05:40 CET 2004 - mcihar@suse.cz ------------------------------------------------------------------- Mon Nov 22 17:39:14 CET 2004 - ro@suse.de -- fix build with current wxGTK +- fix build with current wxGTK ------------------------------------------------------------------- Thu Sep 30 12:48:14 CEST 2004 - mcihar@suse.cz @@ -382,7 +410,7 @@ Thu Sep 30 12:48:14 CEST 2004 - mcihar@suse.cz ------------------------------------------------------------------- Tue Sep 21 17:10:43 CEST 2004 - mskibbe@suse.de -- change desktopfile +- change desktopfile ------------------------------------------------------------------- Wed Aug 11 11:29:07 CEST 2004 - mcihar@suse.cz diff --git a/hugin.spec b/hugin.spec index c53f6fe..d8c764a 100644 --- a/hugin.spec +++ b/hugin.spec @@ -15,37 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: hugin -BuildRequires: Mesa-devel OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel lapack libexiv2-devel liblapack3 libpano-devel >= 2.9.18 libxml2 update-desktop-files vigra zip -%if %suse_version > 1130 -BuildRequires: python-wxWidgets >= 2.7.0 wxWidgets-devel -%else -BuildRequires: python-wxGTK >= 2.7.0 wxGTK-devel -%endif -%if %suse_version > 1020 +BuildRequires: Mesa-devel +BuildRequires: OpenEXR-devel +BuildRequires: SDL-devel +BuildRequires: boost-devel +BuildRequires: cmake BuildRequires: fdupes +BuildRequires: fftw3-devel +BuildRequires: freeglut-devel +BuildRequires: gcc-c++ +BuildRequires: glew-devel +BuildRequires: lapack +BuildRequires: libexiv2-devel +BuildRequires: liblapack3 +BuildRequires: libpano-devel >= 2.9.18 +BuildRequires: libxml2 +BuildRequires: tclap +BuildRequires: update-desktop-files +BuildRequires: vigra +BuildRequires: zip +%if 0%{?suse_version} > 1130 +BuildRequires: python-wxWidgets >= 2.7.0 +BuildRequires: wxWidgets-devel +%else +BuildRequires: python-wxGTK >= 2.7.0 +BuildRequires: wxGTK-devel %endif -License: GPLv2+ -Group: Productivity/Graphics/Other +%define mversion 2011.4 +Version: %{mversion}.0 +Release: 0 Summary: Toolchain for Stitching of Images and Creating Panoramas -Version: 2011.0.0 -Release: 1 -Source: http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-2011.0/%{name}-%{version}.tar.bz2 +License: GPL-2.0+ +Group: Productivity/Graphics/Other +Url: http://hugin.sourceforge.net/ +Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin -#Source: %{name}-svn2008xxxx.tar.bz2 +#Source: %%{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy -Url: http://hugin.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: make -# Optional package, if missing, it could cause unexpected errors: Requires: enblend-enfuse >= 3.2 -# Optional third party package: -Recommends: autopano-sift exiftool -%if %suse_version > 1130 +Recommends: autopano-sift +Recommends: exiftool +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1130 %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires %endif @@ -59,24 +72,11 @@ Other tools in this package can correct lens distortion, vignetting and chromatic abberation, create HDR images, provide automatic feature detection and extraction of key points. -Authors: --------- - Pablo d'Angelo - Kai-Uwe Behrmann - Douglas Wilkins - Ed Halley - Ippei Ukai - Bruno Postle - Alexandre Jenny - Ziv Yaniv - John Navas - Luca Vascon - Fabian Wetzel - %prep %setup -q + # For SVN snapshot: -#setup -q -n %{name} +#setup -q -n %%{name} # Rename Catalan in Spain to Catalan. mv src/translations/ca_ES.po src/translations/ca.po # Rename Czech in Czech Republic to Czech. @@ -90,38 +90,51 @@ mv README_JP.new2 README_JP rm README_JP.new # For SVN snapshot: #mkdir bin -#cp %{S:1} bin/svn +#cp %%{SOURCE1} bin/svn #chmod +x bin/svn %build export PATH=$PWD/bin:$PATH +export CFLAGS="%{optflags}" +export CXXFLAGS="$CFLAGS" LIB_SUFFIX=%{_lib} LIB_SUFFIX=${LIB_SUFFIX#lib} cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON . -make %{?jobs:-j%jobs} +# parallel make kills our workers +make -j1 VERBOSE=1 %install -%makeinstall +%make_install %suse_update_desktop_file hugin 2DGraphics %suse_update_desktop_file PTBatcherGUI 2DGraphics +%suse_update_desktop_file calibrate_lens_gui 2DGraphics # locales %{find_lang} %{name} # Use better place for MIME icons. -mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/ -%fdupes $RPM_BUILD_ROOT%{_datadir} - -%clean -rm -rf $RPM_BUILD_ROOT +mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %{buildroot}%{_docdir}/%{name}/ +chmod -x %{buildroot}%{_docdir}/%{name}/* %post -%icon_theme_cache_post -%mime_database_post +%if 0%{?suse_version} > 1130 + %icon_theme_cache_post + %mime_database_post +%else + if test -f %{_bindir}/update-mime-database ; then + %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null + fi +%endif %postun -%icon_theme_cache_postun -%mime_database_postun +%if 0%{?suse_version} > 1130 + %icon_theme_cache_postun + %mime_database_postun +%else + if test -f %{_bindir}/update-mime-database ; then + %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null + fi +%endif %files -f %{name}.lang %defattr(-,root,root)