Hello community,

here is the log from the commit of package gimp-help for openSUSE:Factory 
checked in at 2013-02-02 18:51:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gimp-help (Old)
 and      /work/SRC/openSUSE:Factory/.gimp-help.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gimp-help", Maintainer is "gnome-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gimp-help/gimp-help.changes      2012-11-02 
17:33:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gimp-help.new/gimp-help.changes 2013-02-02 
18:51:54.000000000 +0100
@@ -1,0 +2,13 @@
+Sat Jan 12 14:40:37 UTC 2013 - dims...@opensuse.org
+
+- Add gimp-help-2.8.0-missing-po-files.patch: Add missing .po files
+  to the source directory. Fixes build on Factory.
+- Drop Makefile.GNU and use upstream shipped build system, as this
+  works again.
+- Unset MALLOC_CHECK_ and MALLOC_PERTURB_ to avoid some crashes
+  (hack only.. no fix yet).
+- Add new sub packages for new languages that apeared due to using
+  the upstream / maintained makefile: ca, el, en_GB, fi, hr, lt and
+  sl.
+
+-------------------------------------------------------------------

Old:
----
  Makefile.GNU
  gimp-help-2.doap

New:
----
  gimp-help-2.8.0-missing-po-files.patch

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

Other differences:
------------------
++++++ gimp-help.spec ++++++
--- /var/tmp/diff_new_pack.ik8ipx/_old  2013-02-02 18:51:58.000000000 +0100
+++ /var/tmp/diff_new_pack.ik8ipx/_new  2013-02-02 18:51:58.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gimp-help
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -19,16 +19,14 @@
 Name:           gimp-help
 Version:        2.8.0
 Release:        0
-# FIXME: on update, see if we still need Makefile.GNU as additional source 
(last check: 2.6.1). See bgo#639057.
 # FIXME: Check if parallel build reliably works again (last check: 2.6.1)
 Summary:        Help System Data for GIMP
 License:        GFDL-1.2
 Group:          Productivity/Graphics/Bitmap Editors
 Url:            http://www.gimp.org/
 Source0:        ftp://ftp.gimp.org/pub/gimp/help/%{name}-%{version}.tar.bz2
-# Taken from git on 2011-01-09. Default Makefile doesn't work.
-Source1:        Makefile.GNU
-Source2:        gimp-help-2.doap
+# PATCH-FIX-UPSTREAM gimp-help-2.8.0-missing-po-files.patch 
dims...@opensuse.org -- Add missing .po files
+Patch0:         gimp-help-2.8.0-missing-po-files.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gimp-devel
@@ -47,6 +45,18 @@
 GIMP-Help is a help system designed for use with the internal GIMP help
 browser, external Web browser and HTML renderers, and human eyeballs.
 
+%package ca
+Summary:        Catalanian Help System Data for GIMP
+Group:          System/Localization
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:ca)
+
+%description ca
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides Catalanian data for gimp-help.
+
 %package da
 Summary:        Danish Help System Data for GIMP
 Group:          System/Localization
@@ -71,6 +81,30 @@
 
 This package provides German data for gimp-help.
 
+%package el
+Summary:        Greek Help System Data for GIMP
+Group:          System/Localization
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:el)
+
+%description el
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides Greek data for gimp-help.
+
+%package en_GB
+Summary:        British English Help System Data for GIMP
+Group:          System/Localization
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:en_GB)
+
+%description en_GB
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides British English data for gimp-help.
+
 %package es
 Summary:        Spanish Help System Data for GIMP
 Group:          System/Localization
@@ -83,6 +117,18 @@
 
 This package provides Spanish data for gimp-help.
 
+%package fi
+Summary:        Finnish Help System Data for GIMP
+Group:          System/Localization
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:fi)
+
+%description fi
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides Finnish data for gimp-help.
+
 %package fr
 Summary:        French Help System Data for GIMP
 Group:          System/Localization
@@ -95,6 +141,18 @@
 
 This package provides French data for gimp-help.
 
+%package hr
+Summary:        Croatian Help System Data for GIMP
+Group:          System/Localization
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:hr)
+
+%description hr
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides Croatian data for gimp-help.
+
 %package it
 Summary:        Italian Help System Data for GIMP
 Group:          System/Localization
@@ -131,6 +189,18 @@
 
 This package provides Korean data for gimp-help.
 
+%package lt
+Summary:        Lithuanian Help System Data for GIMP
+Group:          System/I18n/Korean
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:lt)
+
+%description lt
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides Lithuanian data for gimp-help.
+
 %package nl
 Summary:        Dutch Help System Data for GIMP
 Group:          System/Localization
@@ -179,6 +249,18 @@
 
 This package provides Russian data for gimp-help.
 
+%package sl
+Summary:        Slovenian Help System Data for GIMP
+Group:          System/Localization
+Requires:       %{name} = %{version}
+Provides:       locale(%{name}:sl)
+
+%description sl
+GIMP-Help is a help system designed for use with the internal GIMP help
+browser, external Web browser and HTML renderers, and human eyeballs.
+
+This package provides Slovenian data for gimp-help.
+
 %package sv
 Summary:        Swedish Help System Data for GIMP
 Group:          System/Localization
@@ -205,23 +287,19 @@
 
 %prep
 %setup -q
-cp %{S:1} .
-cp %{S:2} .
+%patch0 -p1
 
 %build
+unset MALLOC_CHECK_
+unset MALLOC_PERTURB_
 %configure
-#make -f Makefile.GNU %{?jobs:-j%jobs}
-# Parallel build is broken
-make -f Makefile.GNU
+make
 
 # unify the permissions of images, to make fdupes working again (bnc#784670)
 find images/ -type f -exec chmod 0644 {} +
 
 %install
-#FIXME: we can't use the usual macro since we don't use the standard Makefile
-#%make_install
-install -d %{buildroot}%{_datadir}/gimp/2.0/help
-cp -RL html/* %{buildroot}%{_datadir}/gimp/2.0/help/
+%make_install
 for locale in %{buildroot}%{_datadir}/gimp/2.0/help/*; do
   %fdupes $locale
 done
@@ -235,6 +313,10 @@
 %dir %{_datadir}/gimp/2.0/help
 %{_datadir}/gimp/2.0/help/en/
 
+%files ca
+%defattr (-,root,root)
+%lang(ca) %{_datadir}/gimp/2.0/help/ca/
+
 %files da
 %defattr (-,root,root)
 %lang(da) %{_datadir}/gimp/2.0/help/da/
@@ -243,14 +325,30 @@
 %defattr (-,root,root)
 %lang(de) %{_datadir}/gimp/2.0/help/de/
 
+%files el
+%defattr (-,root,root)
+%lang(el) %{_datadir}/gimp/2.0/help/el/
+
+%files en_GB
+%defattr (-,root,root)
+%lang(en_GB) %{_datadir}/gimp/2.0/help/en_GB/
+
 %files es
 %defattr (-,root,root)
 %lang(es) %{_datadir}/gimp/2.0/help/es/
 
+%files fi
+%defattr (-,root,root)
+%lang(fi) %{_datadir}/gimp/2.0/help/fi/
+
 %files fr
 %defattr (-,root,root)
 %lang(fr) %{_datadir}/gimp/2.0/help/fr/
 
+%files hr
+%defattr (-,root,root)
+%lang(hr) %{_datadir}/gimp/2.0/help/hr/
+
 %files it
 %defattr (-,root,root)
 %lang(it) %{_datadir}/gimp/2.0/help/it/
@@ -263,6 +361,10 @@
 %defattr (-,root,root)
 %lang(ko) %{_datadir}/gimp/2.0/help/ko/
 
+%files lt
+%defattr (-,root,root)
+%lang(lt) %{_datadir}/gimp/2.0/help/lt/
+
 %files nl
 %defattr (-,root,root)
 %lang(nl) %{_datadir}/gimp/2.0/help/nl/
@@ -279,6 +381,10 @@
 %defattr (-,root,root)
 %lang(ru) %{_datadir}/gimp/2.0/help/ru/
 
+%files sl
+%defattr (-,root,root)
+%lang(sl) %{_datadir}/gimp/2.0/help/sl/
+
 %files sv
 %defattr (-,root,root)
 %lang(sv) %{_datadir}/gimp/2.0/help/sv/

++++++ gimp-help-2.8.0-missing-po-files.patch ++++++
++++ 1883 lines (skipped)

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

Reply via email to