Accepting request 98363 from graphics

-Updated to version 2011.4.0:
 * numerous translation updates
 * bug fixes
 * new pto-gen tool
 * build system fixes

- Fixed build on openSUSE 11.3.

- 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.

- disable parallel build and enable verbose compilne

- Add hugin-fix-gcc46.patch: fix gcc 4.6 compilation
  * Set blender and fusion options to default value when user
  * Fixes update of preview window when projection parameter
- fix build with gcc-4.4
- removed gnome-icon-theme from BuildRequires [#247450]
- accept gettext 0.16 ...
  * added tool fulla (see man pages), for distortion, TCA and vignetting
- remove some extra qualifications to fix build with gcc-4.1
- fixed missing part of function
- fix build with current wxGTK
- change desktopfile

OBS-URL: https://build.opensuse.org/request/show/98363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=32

hugin-2011.0.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
-size 11439430

hugin-2011.4.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
+size 11740410

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
 

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
+BuildRequires:  Mesa-devel
-%if %suse_version > 1130
+BuildRequires:  OpenEXR-devel
-BuildRequires:  python-wxWidgets >= 2.7.0 wxWidgets-devel
+BuildRequires:  SDL-devel
-%else
+BuildRequires:  boost-devel
-BuildRequires:  python-wxGTK >= 2.7.0 wxGTK-devel
+BuildRequires:  cmake
-%endif
-%if %suse_version > 1020
 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+
+%define mversion 2011.4
-Group:          Productivity/Graphics/Other
+Version:        %{mversion}.0
+Release:        0
 Summary:        Toolchain for Stitching of Images and Creating Panoramas
-Version:        2011.0.0
+License:        GPL-2.0+
-Release:        1
+Group:          Productivity/Graphics/Other
-Source:         http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-2011.0/%{name}-%{version}.tar.bz2
+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
-Recommends:     autopano-sift exiftool
+Recommends:     exiftool
-%if %suse_version > 1130
+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 <pablo.dangelo@web.de>
-    Kai-Uwe Behrmann <ku.b@gmx.de>
-    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
+mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/
+cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %{buildroot}%{_docdir}/%{name}/
-%fdupes $RPM_BUILD_ROOT%{_datadir}
+chmod -x %{buildroot}%{_docdir}/%{name}/*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
-%icon_theme_cache_post
+%if 0%{?suse_version} > 1130
-%mime_database_post
+  %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
+%if 0%{?suse_version} > 1130
-%mime_database_postun
+  %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)