Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2016-02-11 12:38:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin" Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2016-01-28 17:22:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2016-02-11 12:38:14.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 2 17:04:05 UTC 2016 - [email protected] + +- Added hugin.appdata.patch to fix appdata.xml and desktop file + consistency. see boo#952324 and boo#962214 +- Added find-hugin-provides.prov to enable hugin to provide + appdata.xml and desktop files to fix installation system problems. + hugin didn't provide them due to the internal dependency generator + having to be disabled to deal with complex wxWidget requires. + +------------------------------------------------------------------- New: ---- find-hugin-provides.prov hugin.appdata.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.IlXlx4/_old 2016-02-11 12:38:15.000000000 +0100 +++ /var/tmp/diff_new_pack.IlXlx4/_new 2016-02-11 12:38:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hugin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,14 +58,20 @@ # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin #Source: %%{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy +# This script is a combined appdata.prov and desktop-file.prov to enable hugin to provide appdata.xml and desktop files see boo#952324 +Source2: find-hugin-provides.prov +Patch0: hugin.appdata.patch Requires: enblend-enfuse >= 3.2 # needed for photo stiching (bnc#822775) Requires: make Recommends: autopano-sift Recommends: exiftool BuildRoot: %{_tmppath}/%{name}-%{version}-build + %define _use_internal_dependency_generator 0 +%define __find_provides %{SOURCE2} %define __find_requires %wx_requires +#%%debug_package %description Hugin can be used to stitch multiple images together. The resulting @@ -78,6 +84,7 @@ %prep %setup -q +%patch0 # For SVN snapshot: #setup -q -n %%{name} @@ -96,6 +103,7 @@ #mkdir bin #cp %%{SOURCE1} bin/svn #chmod +x bin/svn +chmod 0755 %{SOURCE2} %build export PATH=$PWD/bin:$PATH @@ -121,7 +129,7 @@ # locales %{find_lang} %{name} # Use better place for MIME icons. -mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor +mv -f %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor mkdir -p %{buildroot}%{_docdir}/%{name} cp -a AUTHORS authors.txt COPYING ChangeLog README README_JP TODO %{buildroot}%{_docdir}/%{name}/ chmod -x %{buildroot}%{_docdir}/%{name}/* ++++++ find-hugin-provides.prov ++++++ #!/bin/sh # # Combined library.prov, desktop-file.prov and appdata.prov for hugin # # Transform appdata xml file into RPM appdata(filename) provides # Author: Michael Schroeder <[email protected]> # # Transform desktop mimetype info into RPM mimehandler(type) provides # Author: Richard Hughes <[email protected]> # # Also based on library provides scripts from RPM OLD_IFS="$IFS" mark64=$(uname -m |grep -o 64) while read instfile ; do case "$instfile" in *.desktop) if ! grep -q '^Type=Application$' "$instfile"; then continue; fi if ! grep -q '^Exec=' "$instfile"; then continue; fi echo "application()" echo "application(${instfile##*/applications/})" mime=`grep '^MimeType=' "$instfile" | cut -d'=' -f2` IFS=';' for type in $mime ; do echo 'mimehandler('$type')' done ;; *.appdata.xml) echo "appdata()" echo "appdata(${instfile##*/appdata/})" ;; */usr/lib$mark64/*.so.?.?) soname=$(objdump -p $instfile | awk '/SONAME/ {print $2}') if [ $mark64 -eq 64 ] ; then lib64="()(64bit)" ; else lib64="" ; fi echo "$soname$lib64" ;; esac done IFS=$OLD_IFS ++++++ hugin.appdata.patch ++++++ Index: platforms/linux/appdata/PTBatcherGUI.appdata.xml =================================================================== --- platforms/linux/appdata/PTBatcherGUI.appdata.xml.orig +++ platforms/linux/appdata/PTBatcherGUI.appdata.xml @@ -3,7 +3,7 @@ <application> <id type="desktop">PTBatcherGUI.desktop</id> <licence>GFDL</licence> - <name>Hugin batch processor</name> + <name>Hugin Batch Processor</name> <summary>A GUI queue manager for stitching multiple hugin projects</summary> <description> <p> Index: platforms/linux/appdata/calibrate_lens_gui.appdata.xml =================================================================== --- platforms/linux/appdata/calibrate_lens_gui.appdata.xml.orig +++ platforms/linux/appdata/calibrate_lens_gui.appdata.xml @@ -3,7 +3,7 @@ <application> <id type="desktop">calibrate_lens_gui.desktop</id> <licence>GFDL</licence> - <name>Hugin calibrate lens</name> + <name>Hugin Calibrate Lens</name> <summary>Automatic lens calibration</summary> <description> <p> Index: platforms/linux/appdata/hugin.appdata.xml =================================================================== --- platforms/linux/appdata/hugin.appdata.xml.orig +++ platforms/linux/appdata/hugin.appdata.xml @@ -3,7 +3,7 @@ <application> <id type="desktop">hugin.desktop</id> <licence>GFDL</licence> - <name>hugin</name> + <name>Hugin Panorama Creator</name> <summary>A panoramic photo stitcher and more</summary> <description> <p>
