Author: sbrabec
Date: 2019-10-11 01:11:44 +0000 (Fri, 11 Oct 2019)
New Revision: 97442
Modified:
branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-collect
branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-remerge
branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation.conf
Log:
nome-patch-translation: Update tools to SLE12 SP5.
Modified: branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-collect
===================================================================
--- branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-collect 2019-10-07 13:17:40 UTC (rev 97441)
+++ branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-collect 2019-10-11 01:11:44 UTC (rev 97442)
@@ -40,8 +40,19 @@
# Modify some requirements to work without relevant packages installed.
s/%{xulrunner_version}/dummy/g
s/%{mozilla_ver}/dummy/g
+ s/%{glib2_gsettings_schema_requires}/Requires: dummy/g
+ s/%glib2_gsettings_schema_requires/Requires: dummy/g
+ s/%{gtk2_immodule_requires}/Requires: dummy/g
+ s/%{gtk3_immodule_requires}/Requires: dummy/g
+ s/%{py_requires}/Requires: dummy/g
+ s/%py_requires/Requires: dummy/g
+ s/%kde4_runtime_requires/Requires: dummy/g
+ s/%gconf_schemas_prereq/Requires: dummy/g
+ s/%{gconf_schemas_prereq}/Requires: dummy/g
+ s/%glib2_gio_module_requires/Requires: dummy/g
+ s/%{glib2_gio_module_requires}/Requires: dummy/g
' *.spec
- if ! eval rpmbuild --macros=/usr/lib/rpm/macros:/usr/lib/rpm/suse_macros:/usr/lib/rpm/platform/$(uname -i)-linux/macros:/etc/rpm/\\\*:$RPMDIR/macros --nodeps -bp ${*:-*.spec} ; then
+ if ! eval rpmbuild --macros=/usr/lib/rpm/macros:/usr/lib/rpm/suse_macros:/usr/lib/rpm/suse/macros:/usr/lib/rpm/macros.d/macros.systemd:/usr/lib/rpm/platform/$(uname -i)-linux/macros:/etc/rpm/\\\*:$RPMDIR/macros --nodeps -bp ${*:-*.spec} ; then
echo "rpm prep failed"
exit 1
fi
Modified: branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-remerge
===================================================================
--- branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-remerge 2019-10-07 13:17:40 UTC (rev 97441)
+++ branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation-remerge 2019-10-11 01:11:44 UTC (rev 97442)
@@ -24,8 +24,19 @@
# Modify some requirements to work without relevant packages installed.
s/%{xulrunner_version}/dummy/g
s/%{mozilla_ver}/dummy/g
+ s/%{glib2_gsettings_schema_requires}/Requires: dummy/g
+ s/%glib2_gsettings_schema_requires/Requires: dummy/g
+ s/%{gtk2_immodule_requires}/Requires: dummy/g
+ s/%{gtk3_immodule_requires}/Requires: dummy/g
+ s/%{py_requires}/Requires: dummy/g
+ s/%py_requires/Requires: dummy/g
+ s/%kde4_runtime_requires/Requires: dummy/g
+ s/%gconf_schemas_prereq/Requires: dummy/g
+ s/%{gconf_schemas_prereq}/Requires: dummy/g
+ s/%glib2_gio_module_requires/Requires: dummy/g
+ s/%{glib2_gio_module_requires}/Requires: dummy/g
' *.spec
- if ! eval rpmbuild --macros=/usr/lib/rpm/macros:/usr/lib/rpm/suse_macros:/usr/lib/rpm/platform/$(uname -i)-linux/macros:/etc/rpm/\\\*:$RPMDIR/macros --nodeps -bp ${*:-*.spec} ; then
+ if ! eval rpmbuild --macros=/usr/lib/rpm/macros:/usr/lib/rpm/suse_macros:/usr/lib/rpm/suse/macros:/usr/lib/rpm/macros.d/macros.systemd:/usr/lib/rpm/platform/$(uname -i)-linux/macros:/etc/rpm/\\\*:$RPMDIR/macros --nodeps -bp ${*:-*.spec} ; then
echo "rpm prep failed"
exit 1
fi
Modified: branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation.conf
===================================================================
--- branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation.conf 2019-10-07 13:17:40 UTC (rev 97441)
+++ branches/SLE12-SP5/lcn/50-tools/gnome-patch-translation.conf 2019-10-11 01:11:44 UTC (rev 97442)
@@ -11,17 +11,17 @@
LCN_SVN_URI='https://$NAME@svn.opensuse.org/svn/opensuse-i18n/$BRANCH_PATH/lcn'
# lcn branch on LCN SVN
-LCN_BRANCH=SLE12-SP3
+LCN_BRANCH=SLE12-SP5
# osc repositories with packages (space separated list in parentheses, first takes precedence)
-OSC_REPOSITORIES=( home:sbrabec:branches:SUSE:SLE-12-SP3:proposed-translation-fixes SUSE:SLE-12-SP3:GA SUSE:SLE-12-SP2:Update SUSE:SLE-12-SP2:GA SUSE:SLE-12-SP1:Update SUSE:SLE-12-SP1:GA SUSE:SLE-12:Update SUSE:SLE-12:GA )
+OSC_REPOSITORIES=( home:sbrabec:branches:SUSE:SLE-12-SP5:proposed-translation-fixes SUSE:SLE-12-SP5:GA SUSE:SLE-12-SP4:Update SUSE:SLE-12-SP4:GA SUSE:SLE-12-SP3:Update SUSE:SLE-12-SP3:GA SUSE:SLE-12-SP2:Update SUSE:SLE-12-SP2:GA SUSE:SLE-12-SP1:Update SUSE:SLE-12-SP1:GA SUSE:SLE-12:Update SUSE:SLE-12:GA )
# list of packages in gnome-patch-translation project
# can re-appear after rebase of patches: gnome-power-manager gnome-session nautilus
GPT_PACKAGES="evolution gconf-editor gnome-settings-daemon gnome-shell gnome-shell-extensions gnome-vfs2 gstreamer gstreamer-0_10 gtk2 mutter pan xchat"
# Version of gnome-patch-translation-package.
-GPT_VERSION="13.1.3"
+GPT_VERSION="13.1.5"
# osc server, empty for using of the osc default
OSC_APIURL=