Hello community,

here is the log from the commit of package merkaartor for openSUSE:Factory
checked in at Tue Mar 22 17:53:32 CET 2011.



--------
New Changes file:

--- /dev/null   2010-08-26 16:28:41.000000000 +0200
+++ merkaartor/merkaartor.changes       2011-03-22 13:16:18.000000000 +0100
@@ -0,0 +1,84 @@
+-------------------------------------------------------------------
+Tue Mar 22 11:40:15 UTC 2011 - sasc...@suse.de
+
+- Don't cleanup buildroot in %%install section
+- Use default file permissions in %%files section
+
+-------------------------------------------------------------------
+Wed Feb  2 14:44:24 UTC 2011 - sasc...@suse.de
+
+- Fixed icon directory ownership by requiring hicolor-icon-scheme
+
+-------------------------------------------------------------------
+Wed Jan 26 12:00:00 UTC 2011 - opens...@dstoecker.de
+
+- update to 0.17.0
+
+-------------------------------------------------------------------
+Wed Dec  8 14:17:30 UTC 2010 - sasc...@suse.de
+
+- Spec file cleanup
+  * Moved changelog into changes file
+  * Fixed openSUSE-11.2 build
+
+-------------------------------------------------------------------
+Thu Aug 19 00:00:00 UTC 2010 - opens...@dstoecker.de
+
+- Build version 0.16.3 (minor fixes)
+
+-------------------------------------------------------------------
+Mon Jun 14 00:00:00 UTC 2010 - opens...@dstoecker.de
+
+- Build version 0.16.1
+ -  FIX : crash when deleting relations
+ -  ADD : Allow to move complete relations
+ -  FIX : First feature not OSM exported
+ -  FIX : WMS'es in EPSG:4326 not showing
+ -  FIX : Don't overzoom on layer zoom (and don't allow if the bbox is null). 
fixes #3046
+ -  ADD : Add a "portable" mode to merkaartor via command-line ("-p") or build 
setting ("PORTABLE=1")
+
+-------------------------------------------------------------------
+Wed Apr  7 00:00:00 UTC 2010 - joop.boo...@opensuse.org 0.15.3
+
+- Build version 0.15.3
+
+-------------------------------------------------------------------
+Mon Mar  8 00:00:00 UTC 2010 - opens...@dstoecker.de
+
+- update to 0.15.2
+
+-------------------------------------------------------------------
+Wed Aug 12 00:00:00 UTC 2009 - opens...@dstoecker.de
+
+- update to 0.14
+
+-------------------------------------------------------------------
+Thu Apr  2 00:00:00 UTC 2009 - opens...@dstoecker.de
+
+- update to 0.13.1
+
+-------------------------------------------------------------------
+Mon Mar 16 00:00:00 UTC 2009 - opens...@dstoecker.de
+
+- update to 0.13
+
+-------------------------------------------------------------------
+Wed Oct 15 00:00:00 UTC 2008 - opens...@dstoecker.de
+
+- update to 0.12
+
+-------------------------------------------------------------------
+Thu Aug  7 00:00:00 UTC 2008 - opens...@dstoecker.de
+
+- update to 0.11
+
+-------------------------------------------------------------------
+Fri Apr 11 00:00:00 UTC 2008 - opens...@dstoecker.de
+
+- update to 0.0.10
+
+-------------------------------------------------------------------
+Sun Mar 23 00:00:00 UTC 2008 - Dirk Stöcker 0.0.9
+
+- first version
+

calling whatdependson for head-i586


New:
----
  merkaartor-0.17.2.tar.bz2
  merkaartor.changes
  merkaartor.desktop
  merkaartor.png
  merkaartor.spec
  merkaartor.xml
  x-kml+xml.desktop
  x-mdc+xml.desktop
  x-nmea.desktop
  x-noniplot.desktop
  x-osb.desktop

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ merkaartor.spec ++++++
#
# spec file for package merkaartor
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild


Name:           merkaartor
Version:        0.17.2
Release:        1
License:        GPLv3+
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
AutoReqProv:    on
Group:          Productivity/Graphics/Other
Url:            http://www.irule.be/bvh/c++/merkaartor/
Summary:        Small QT-based OpenStreetMap editor
Source:         %{name}-%{version}.tar.bz2
Source2:        %{name}.desktop
Source3:        %{name}.png
BuildRequires:  boost-devel gcc gcc-c++ gpsd-devel libxslt-devel
BuildRequires:  libQtWebKit-devel libgdal-devel libproj-devel
BuildRequires:  hicolor-icon-theme libspatialite-devel libzbar-devel
%if 0%{?suse_version} >= 1020
BuildRequires:  libexiv2-devel
%endif
%if 0%{?suse_version} >= 1130
BuildRequires:  libxml2-devel
%else
BuildRequires:  libxml-devel
%endif
%if 0%{?mandriva_version}
BuildRequires:  X11-devel qt4-devel
%else
%if 0%{?fedora_version}
BuildRequires:  qt4 qt4-devel
%else
BuildRequires:  qt-devel
%endif
BuildRequires:  xorg-x11-devel
%endif
%if 0%{?suse_version} >= 1000
PreReq:         shared-mime-info
Source9:        merkaartor.xml
%endif
%if 0%{?suse_version} < 1120
Source4:        x-mdc+xml.desktop
Source5:        x-kml+xml.desktop
Source6:        x-nmea.desktop
Source7:        x-noniplot.desktop
Source8:        x-osb.desktop
%if 0%{?suse_version}
# for >= 11.1 validity tests
BuildRequires:  kdelibs3
%endif
%endif
%if 0%{?suse_version} == 1120
BuildRequires:  hicolor-icon-theme
%endif

%description
Merkaartor is a small editor for OpenStreetMap available under the
GNU General Public License and developed using the Qt toolkit.

It has some unique features like anti-aliased displaying,
transparent display of map features like roads and true curved roads.

%prep
%setup
%define lrelease lrelease
%define qmake qmake

%build
# seems PROJ=1 is buggy at the moment
%if 0%{?suse_version} >= 1020
%if 0%{?suse_version} >= 1120
%define flags NODEBUG=1 GDAL=1 GPSDLIB=1 PROJ=1 ZBAR=1 SPATIALITE=1 GEOIMAGE=1 
LIBDIR=%{_libdir}
%else
%define flags NODEBUG=1 GDAL=1 GPSD=1 GEOIMAGE=1 FORCE_CUSTOM_STYLE=1 
LIBDIR=%{_libdir}
%endif
%else
%define flags NODEBUG=1 GDAL=1 GPSD=1 GEOIMAGE=0 FORCE_CUSTOM_STYLE=1 
LIBDIR=%{_libdir}
%endif
%if 0%{?mandriva_version}
%define lrelease lrelease-qt4
%define qmake qmake-qt4
%else
%if 0%{?fedora_version}
%define lrelease lrelease-qt4
%define qmake qmake-qt4
%endif
%endif
%{lrelease} Merkaartor.pro
%{qmake} Merkaartor.pro PREFIX=%{_prefix} %{flags}

%install
make INSTALL_ROOT=%{buildroot} install
install -d 755 %{buildroot}/%{_datadir}/applications
install -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.desktop
install -d 755 %{buildroot}/%{_datadir}/pixmaps
install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps/%{name}.png

%if 0%{?suse_version} < 1120
install -d 755 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
install -m 644 %SOURCE4 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
install -m 644 %SOURCE5 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
install -m 644 %SOURCE6 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
install -m 644 %SOURCE7 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
install -m 644 %SOURCE8 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
%endif
%if 0%{?suse_version} >= 1000
install -d 755 $RPM_BUILD_ROOT/usr/share/mime/packages/
install -m 644 %SOURCE9 $RPM_BUILD_ROOT/usr/share/mime/packages/
%endif

%if 0%{?suse_version} >= 1000

%post
# update mime and desktop database
if [ -f usr/bin/update-mime-database ] ; then
  usr/bin/update-mime-database /usr/share/mime > /dev/null || :
fi
if [ -f usr/bin/update-desktop-database ] ; then
  usr/bin/update-desktop-database > /dev/null || :
fi

%postun
if [ -f usr/bin/update-mime-database ] ; then
  usr/bin/update-mime-database /usr/share/mime > /dev/null || :
fi
if [ -f usr/bin/update-desktop-database ] ; then
  usr/bin/update-desktop-database > /dev/null || :
fi
%endif

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG HACKING LICENSE
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_prefix}/share/%{name}
%{_libdir}/%{name}
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%if 0%{?suse_version} < 1120
%config(noreplace) /opt/kde3/share/mimelnk/application/*
%endif
%if 0%{?suse_version} >= 1000
/usr/share/mime/packages/merkaartor.xml
%endif

%changelog
++++++ merkaartor.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Name=Merkaartor Map Editor
GenericName=Editor for OpenStreetMap maps
Icon=merkaartor
Exec=merkaartor
Terminal=0
Type=Application
Categories=Graphics;Science;Geoscience;Geography;X-SuSE-Core-Graphics;
MimeType=application/x-gpx+xml;application/x-osm+xml;application/x-mdc+xml;application/x-osb;application/x-noniplot;application/x-nmea;application/x-kml+xml;
X-SuSE-translate=false
++++++ x-kml+xml.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Comment=KML track
Comment[de]=KML-Track
Icon=merkaartor.png
Type=MimeType
MimeType=application/x-kml+xml
Patterns=*.kml;*.KML
X-SuSE-translate=false

[Property::X-KDE-text]
Type=bool
Value=true

++++++ x-mdc+xml.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Comment=Merkaartor data
Comment[de]=Merkaartor-Daten
Icon=merkaartor.png
Type=MimeType
MimeType=application/x-mdc+xml
Patterns=*.mdc
X-SuSE-translate=false

[Property::X-KDE-text]
Type=bool
Value=true

++++++ x-nmea.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Comment=NMEA data
Comment[de]=NMEA-Daten
Icon=merkaartor.png
Type=MimeType
MimeType=application/x-nmea
Patterns=*.nmea;*.nma;*.nme
X-SuSE-translate=false

[Property::X-KDE-text]
Type=bool
Value=true
++++++ x-noniplot.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Comment=Noni GPSPlot data
Comment[de]=Noni GPSPlot-Daten
Icon=merkaartor.png
Type=MimeType
MimeType=application/x-noniplot
Patterns=*.ngt
X-SuSE-translate=false

[Property::X-KDE-text]
Type=bool
Value=true
++++++ x-osb.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Comment=OpenStreetMap binary data
Comment[de]=OpenStreetMap-Binärdaten
Icon=merkaartor.png
Type=MimeType
MimeType=application/x-osb
Patterns=*.osb
X-SuSE-translate=false

[Property::X-KDE-text]
Type=bool
Value=true

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to