Author: qboosh Date: Thu Jul 31 04:54:57 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- started update to 0.7.0 (still fighting with cmake); needs cvs enblend
---- Files affected:
SPECS:
hugin.spec (1.33 -> 1.33.2.1)
---- Diffs:
================================================================
Index: SPECS/hugin.spec
diff -u SPECS/hugin.spec:1.33 SPECS/hugin.spec:1.33.2.1
--- SPECS/hugin.spec:1.33 Mon May 12 15:47:12 2008
+++ SPECS/hugin.spec Thu Jul 31 06:54:51 2008
@@ -1,43 +1,39 @@
# $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
-Release: 0.%{_beta}.3
+Version: 0.7.0
+Release: 0.1
License: GPL v2+
-Group: Applications/Graphics
-Source0:
http://dl.sourceforge.net/hugin/%{name}-%{version}_%{_beta}.tar.bz2
-# Source0-md5: 28b69d85ae06a22fe9514f7f77e6dddb
+Group: X11/Applications/Graphics
+Source0: http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
+# Source0-md5: 927a46b603d6334853aa619c3bfb729f
Patch0: %{name}-pl.po-update.patch
-Patch1: %{name}-defaults.patch
-Patch2: %{name}-asneeded.patch
+# obsolete
+#Patch1: %{name}-defaults.patch
+# recheck (cmake doesn't get -as-needed at all so far)
+#Patch2: %{name}-asneeded.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: 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 >= 3.1
+# exiftool program
+Suggests: perl-Image-ExifTool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -45,72 +41,88 @@
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 -n %{name}-%{version}_%{_beta}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-sed -i -e 's,/lib",/%{_lib}",' m4/ax_boost.m4
-sed -i -e 's/ca_ES/ca/;s/cs_CZ/cs/;' src/hugin/po/LINGUAS
-mv -f src/hugin/po/{ca_ES,ca}.po
-mv -f src/hugin/po/{cs_CZ,cs}.po
-# missing in LINGUAS
-echo 'cs'>> src/nona_gui/po/LINGUAS
-mv -f src/nona_gui/po/{cs_CZ,cs}.po
+%setup -q
+#UPDATEME %patch0 -p1
+
+sed -i -e 's/ca_ES/ca/;s/cs_CZ/cs/;' src/translations/cmake_install.cmake
+mv -f src/translations/{ca_ES,ca}.po
+mv -f src/translations/{cs_CZ,cs}.po
%build
-%{__gettextize}
-cp -f po/Makefile.in.in src/hugin/po
-cp -f po/Makefile.in.in src/nona_gui/po
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --with-wx-config=wx-gtk2-unicode-config
+install -d build
+cd build
+# CMAKE_AR is a hack, cmake is unable to find it otherwise and doesn't
+# provide config.log to investigate why
+# CMAKE_BUILD_TYPE is a hack not to override our optflags
+%cmake .. \
+ -DCMAKE_AR=/usr/bin/ar \
+ -DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:optflags_workaround} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+%if "%{_lib}" == "64"
+ -DLIB_PREFIX=64 \
+%endif
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-gtk2-unicode-config
+
%{__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
+
+# cmake is so great there is no way to pass proper path
+mv $RPM_BUILD_ROOT%{_iconsdir}/{gnome,hicolor}
-# "hugin" and "nona_gui" domains
-%find_lang %{name} --all-name
+# 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}/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*
@@ -120,6 +132,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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.33&r2=1.33.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
