From 0e50b1b284fa26c3ee755aaad281264f84228193ef4b9dba4d03e277cb1b7402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 19 Dec 2019 19:34:27 +0000 Subject: [PATCH] Accepting request 758123 from GNOME:Next Converted to _multibuild; replaces gnome-menus-branding-{openSUSE,SLED} OBS-URL: https://build.opensuse.org/request/show/758123 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-menus-branding?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + _multibuild | 5 + gnome-menus-branding-COPYING | 31 ++++ ...branding-remove-X-SuSE-ControlCenter.patch | 18 ++ gnome-menus-branding.changes | 162 ++++++++++++++++++ gnome-menus-branding.spec | 84 +++++++++ pre_checkin.sh | 18 ++ 8 files changed, 342 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _multibuild create mode 100644 gnome-menus-branding-COPYING create mode 100644 gnome-menus-branding-remove-X-SuSE-ControlCenter.patch create mode 100644 gnome-menus-branding.changes create mode 100644 gnome-menus-branding.spec create mode 100644 pre_checkin.sh diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..817b812 --- /dev/null +++ b/_multibuild @@ -0,0 +1,5 @@ + + openSUSE + SLED + + diff --git a/gnome-menus-branding-COPYING b/gnome-menus-branding-COPYING new file mode 100644 index 0000000..e97739d --- /dev/null +++ b/gnome-menus-branding-COPYING @@ -0,0 +1,31 @@ +Copyright (c) 2008, Novell, Inc. +All rights reserved. + +This package (other than those portions that are trademarks, logos, and trade +dress of Novell, Inc), is made available under the following terms: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +* Neither the name of the Novell nor the names of its contributors may be +used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. diff --git a/gnome-menus-branding-remove-X-SuSE-ControlCenter.patch b/gnome-menus-branding-remove-X-SuSE-ControlCenter.patch new file mode 100644 index 0000000..f9087cc --- /dev/null +++ b/gnome-menus-branding-remove-X-SuSE-ControlCenter.patch @@ -0,0 +1,18 @@ +--- gnome-applications.menu.old 2018-12-04 04:07:53.000000000 +0100 ++++ gnome-applications.menu 2019-01-03 21:01:26.583746846 +0100 +@@ -234,6 +234,7 @@ + Settings + X-GNOME-Utilities + ++ YaST.desktop + + + +@@ -298,6 +299,7 @@ + + Core + Screensaver ++ X-SuSE-YaST + + + diff --git a/gnome-menus-branding.changes b/gnome-menus-branding.changes new file mode 100644 index 0000000..1c7e4f3 --- /dev/null +++ b/gnome-menus-branding.changes @@ -0,0 +1,162 @@ +------------------------------------------------------------------- +Thu Dec 19 09:59:43 UTC 2019 - Dominique Leuenberger + +- Convert package to _multibuild. + +------------------------------------------------------------------- +Thu Jan 3 20:07:28 UTC 2019 - bjorn.lie@gmail.com + +- Rebase gnome-menus-branding-remove-X-SuSE-ControlCenter.patch. + +------------------------------------------------------------------- +Wed Feb 28 18:34:18 UTC 2018 - dimstar@opensuse.org + +- Modernize spec file using spec-cleaner. + +------------------------------------------------------------------- +Mon Oct 12 16:00:12 UTC 2015 - zaitor@opensuse.org + +- Bump version to 42.1, to prepare for next version of openSUSE. + +------------------------------------------------------------------- +Sat Aug 23 16:10:12 UTC 2014 - zaitor@opensuse.org + +- Bump version to 13.2, to prepare for next version of openSUSE. + +------------------------------------------------------------------- +Thu Oct 3 19:18:02 UTC 2013 - dimstar@opensuse.org + +- Rebased gnome-menus-branding-remove-X-SuSE-ControlCenter.patch + on top of gnome-menus 3.10.0. + +------------------------------------------------------------------- +Sun Sep 8 07:43:12 UTC 2013 - zaitor@opensuse.org + +- Bump version to 13.1, to prepare for next version of openSUSE. + +------------------------------------------------------------------- +Wed Mar 6 15:43:24 UTC 2013 - dimstar@opensuse.org + +- Rebase gnome-menus-branding-remove-X-SuSE-ControlCenter.patch on + top of gnome-menus 3.7.90. + +------------------------------------------------------------------- +Wed May 23 07:50:26 UTC 2012 - vuntz@opensuse.org + +- Bump version to 12.2, to prepare for next version of openSUSE. + +------------------------------------------------------------------- +Thu Oct 13 12:57:49 UTC 2011 - vuntz@opensuse.org + +- Remove %{release} from the gnome-menus versioned Requires, to not + have to rebuild this package each time gnome-menus rebuilds to + keep it installable. + +------------------------------------------------------------------- +Fri Jul 22 13:18:09 CEST 2011 - vuntz@opensuse.org + +- Drop gnome-menus-branding-settings.menu source: we do not install + a settings.menu file, since upstream doesn't ship one either. + Fix bnc#703818. + +------------------------------------------------------------------- +Thu Jul 7 10:13:17 CEST 2011 - vuntz@opensuse.org + +- Change License tag from BSD3c to LGPLv2.1+: since we base our + branding on the one from upstream, we inherit the license. + +------------------------------------------------------------------- +Wed Jul 6 16:40:24 CEST 2011 - vuntz@opensuse.org + +- Bump version to 12.1. +- Add a Requires for gnome-menus, since the branding package is + useless without it. +- Update summary and description. +- Add Url tag. + +------------------------------------------------------------------- +Wed Apr 27 16:02:06 CEST 2011 - vuntz@opensuse.org + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + instead of excluding X-SuSE-ControlCenter-* categories, simply + exclude X-SuSE-YaST. We might still want to see .desktop files + with X-SuSE-ControlCenter-* in Other as the control center won't + display them anymore. + +------------------------------------------------------------------- +Wed Apr 27 14:26:20 CEST 2011 - fcrozat@novell.com + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + Ensure YaST launcher is visible in System category. + +------------------------------------------------------------------- +Fri Oct 8 11:48:24 CEST 2010 - vuntz@opensuse.org + +- Bump version to 11.4. + +------------------------------------------------------------------- +Tue Sep 21 17:23:27 CEST 2010 - vuntz@opensuse.org + +- Drop gnome-menus-branding-Hidden.directory: this is needed for + the applications.menu file from desktop-data-openSUSE. But it's + weird to have the file in a different package. Instead, we'll fix + desktop-data-openSUSE to use a file it already ships. + +------------------------------------------------------------------- +Mon Sep 13 14:35:55 CEST 2010 - vuntz@opensuse.org + +- Add gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: this + removes the desktop files with X-SuSE-ControlCenter-* categories + from the Applications menu. They should just appear in the + control center. +- Rename gnome-menus-branding.changes to + gnome-menus-branding.changes.in. + +------------------------------------------------------------------- +Sat Jan 16 02:52:50 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Rename gnome-menus-branding-openSUSE-COPYING to + gnome-menus-branding-COPYING, + gnome-menus-branding-openSUSE-Hidden.directory to + gnome-menus-branding-Hidden.directory and + gnome-menus-branding-openSUSE-settings.menu to + gnome-menus-brandingsettings.menu. +- Make sure to provide the right version of gnome-menus-branding, + based on the version of the gnome-menus package. +- Remove update-desktop-files BuildRequires. + +------------------------------------------------------------------- +Thu Jul 30 04:59:29 CEST 2009 - vuntz@novell.com + +- Update gnome-menus-branding-openSUSE-settings.menu: + + make it closer to the gnomecc.menu from upstream + + remove usage of old X-Ximian categories that are not in use + anymore + + remove some of the previously included YaST tools, they don't + make sense most of the time there. + +------------------------------------------------------------------- +Sun Jan 25 12:54:31 CET 2009 - vuntz@novell.com + +- Remove duplicate category in settings.menu +- Remove old hack to keep some preferences.menu compatibility file. + It should not be needed anymore with the packages we have now. + +------------------------------------------------------------------- +Tue Nov 4 12:03:01 CET 2008 - vuntz@novell.com + +- Upstream has changed the way settings.menu is used for 2.24, so + kill preferences.menu and just use settings.menu now. +- Keep preferences.menu as a link to settings.menu, since we don't + want to break anything because of this. +- Conflicts with other branding providers. +- Spec cleanup. + +------------------------------------------------------------------- +Thu Jul 31 17:02:20 CEST 2008 - sbrabec@suse.cz + +- New SuSE package (fate#303889). + diff --git a/gnome-menus-branding.spec b/gnome-menus-branding.spec new file mode 100644 index 0000000..1ed9dff --- /dev/null +++ b/gnome-menus-branding.spec @@ -0,0 +1,84 @@ +# +# spec file for package gnome-menus-branding.spec +# +# Copyright (c) 2018 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 +# 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/ +# + + +%define flavor @BUILD_FLAVOR@%nil +%if "%{flavor}" == "" +%define branding_name %{nil} +ExclusiveArch: do-not-build +%else +%define branding_name %{flavor} +%define dash - +%if "%{flavor}" == "SLED" +%define build_SLED 1 +%else +%define build_openSUSE 1 +%endif +%if (0%{?build_SLED} && 0%{?is_opensuse}) || (0%{?build_openSUSE} && ! 0%{?is_opensuse}) +# Don't build SLE branding on openSUSE and vice-versa +ExclusiveArch: do-not-build +%endif +%endif + +%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus) +Name: gnome-menus-branding%{?dash}%{branding_name} +Version: 42.1 +Release: 0 +Summary: The GNOME Desktop Menu -- %{branding_name} Menus Definitions +License: LGPL-2.1-or-later +Group: System/GUI/GNOME +URL: http://www.gnome.org +Source: gnome-menus-branding-COPYING +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher +Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch +BuildRequires: gnome-menus +# To be in sync with upstream defaults, do branding as a patch for upstream file. +# WARNING: As this package conflicts with gnome-menus-branding-%{branding_name}, you cannot +# reuse build root. You have to build in a clean build root every time! +BuildRequires: gnome-menus-branding-upstream +Requires: gnome-menus = %{gnome_menus_version} +Supplements: packageand(gnome-menus:branding-%{branding_name}) +Conflicts: gnome-menus-branding +Provides: gnome-menus-branding = %{gnome_menus_version} +BuildArch: noarch + +%description +The package contains an implementation of the draft "Desktop Menu +Specification" from freedesktop.org: + +http://www.freedesktop.org/Standards/menu-spec + +This package provides the %{branding_name} definitions for menus. + +%prep +%setup -q -T -c %{name}-%{version} +cp -a %{SOURCE0} COPYING +# We will base menus on upstream menus: +cp -a %{_sysconfdir}/xdg/menus/*.menu . +%patch0 + +%build + +%install +install -d %{buildroot}%{_sysconfdir}/xdg/menus +install -m0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/ + +%files +%license COPYING +%{_sysconfdir}/xdg/menus/gnome-applications.menu + +%changelog diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..a1b3b52 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +NAME=gnome-menus + +if ! test -f ${NAME}-branding.spec.in ; then + exit +fi + +for variant in openSUSE SLED ; do + cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec + cp ${NAME}-branding.changes.in ${NAME}-branding-${variant}.changes + sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec + sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec + sed -i " + /^Name: *${NAME}-branding-${variant}/i \ +# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in. +" ${NAME}-branding-${variant}.spec +done