Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2011-12-30 08:45:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin", Maintainer is "sbra...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2011-09-23 02:03:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2011-12-30 08:45:46.000000000 +0100 @@ -1,0 +2,28 @@ +Thu Dec 22 06:39:12 UTC 2011 - mrd...@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 - t...@daylessday.org + +- Fixed build on openSUSE 11.3. + +------------------------------------------------------------------- +Thu Oct 20 14:05:44 UTC 2011 - t...@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 - co...@suse.com + +- disable parallel build and enable verbose compilne + +------------------------------------------------------------------- Old: ---- hugin-2011.0.0.tar.bz2 New: ---- hugin-2011.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.vYVst5/_old 2011-12-30 08:45:48.000000000 +0100 +++ /var/tmp/diff_new_pack.vYVst5/_new 2011-12-30 08:45:48.000000000 +0100 @@ -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 @@ chromatic abberation, create HDR images, provide automatic feature detection and extraction of key points. -Authors: --------- - Pablo d'Angelo <pablo.dang...@web.de> - Kai-Uwe Behrmann <k...@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 @@ 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) ++++++ hugin-2011.0.0.tar.bz2 -> hugin-2011.4.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/hugin/hugin-2011.0.0.tar.bz2 /work/SRC/openSUSE:Factory/.hugin.new/hugin-2011.4.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
