commit budgie-desktop-branding for openSUSE:Factory

2020-10-20 Thread root
Hello community,

here is the log from the commit of package budgie-desktop-branding for 
openSUSE:Factory checked in at 2020-10-20 16:06:22

Comparing /work/SRC/openSUSE:Factory/budgie-desktop-branding (Old)
 and  /work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.3486 (New)


Package is "budgie-desktop-branding"

Tue Oct 20 16:06:22 2020 rev:6 rq:842498 version:20201017.1

Changes:

--- 
/work/SRC/openSUSE:Factory/budgie-desktop-branding/budgie-desktop-branding.changes
  2020-10-05 19:40:23.301625937 +0200
+++ 
/work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.3486/budgie-desktop-branding.changes
2020-10-20 16:16:54.202194270 +0200
@@ -1,0 +2,12 @@
+Mon Oct 19 08:22:31 UTC 2020 - Callum Farmer 
+
+- Update to version 20201017.1:
+  * Change the priority from 10 to 21
+
+---
+Thu Oct  8 17:33:32 UTC 2020 - Callum Farmer 
+
+- Update to version 20201008.1:
+ * Add upstream gtk theme settings
+
+---

Old:

  budgie-desktop-branding-20201004.2.tar.gz

New:

  budgie-desktop-branding-20201017.1.tar.gz



Other differences:
--
++ budgie-desktop-branding.spec ++
--- /var/tmp/diff_new_pack.0QbZ2y/_old  2020-10-20 16:16:55.626194945 +0200
+++ /var/tmp/diff_new_pack.0QbZ2y/_new  2020-10-20 16:16:55.626194945 +0200
@@ -24,7 +24,7 @@
 %endif
 
 Name:   budgie-desktop-branding
-Version:20201004.2
+Version:20201017.1
 Release:0
 Summary:Branding of the Budgie Desktop Environment
 Group:  System/GUI/Other
@@ -66,7 +66,7 @@
 Conflicts:  budgie-desktop-branding
 Provides:   budgie-desktop-branding = %{version}
 Recommends: gnome-backgrounds
-Recommends: gtk3-metatheme-greybird-geeko
+Recommends: gtk3-metatheme-greybird
 Recommends: adwaita-icon-theme
 BuildArch:  noarch
 
@@ -85,24 +85,24 @@
 %install
 %meson_install
 %if !0%{?is_backports} && 0%{?suse_version} < 1550
-sed -e 's-5120x3200-3840x2400-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
+sed -e 's-5120x3200-3840x2400-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/21_budgie_gnome_settings_%{nsuffix}.gschema.override
 %endif
 %if 0%{?is_backports} && 0%{?sle_version} < 150300
-sed -e 's-5120x2880-1920x1200-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
+sed -e 's-5120x2880-1920x1200-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/21_budgie_gnome_settings_%{nsuffix}.gschema.override
 %endif
 %if 0%{?is_backports} && 0%{?suse_version} < 1550
-sed -e 's-png-jpg-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
+sed -e 's-png-jpg-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/21_budgie_gnome_settings_%{nsuffix}.gschema.override
 %endif
 
 %files %{nsuffix}
 %license LICENSE LICENSE.CC-BY-SA-3.0
 %doc README.md
-%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
+%{_datadir}/glib-2.0/schemas/21_budgie_gnome_settings_%{nsuffix}.gschema.override
 %{_datadir}/icons/hicolor/scalable/apps/budgie-%{nsuffix}-distributor-logo.svg
 
 %files upstream
 %license LICENSE LICENSE.CC-BY-SA-3.0
 %doc README.md
-%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_upstream.gschema.override
+%{_datadir}/glib-2.0/schemas/21_budgie_gnome_settings_upstream.gschema.override
 
 %changelog

++ budgie-desktop-branding-20201004.2.tar.gz -> 
budgie-desktop-branding-20201017.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/budgie-desktop-branding-20201004.2/schemas/SLE/meson.build 
new/budgie-desktop-branding-20201017.1/schemas/SLE/meson.build
--- old/budgie-desktop-branding-20201004.2/schemas/SLE/meson.build  
2020-10-04 14:54:44.0 +0200
+++ new/budgie-desktop-branding-20201017.1/schemas/SLE/meson.build  
2020-10-18 21:21:20.0 +0200
@@ -5,10 +5,11 @@
 'org.gnome.desktop.background.gschema.override',
 'org.gnome.desktop.interface.gschema.override',
 'org.gnome.desktop.wm.preferences.gschema.override',
+'org.gnome.desktop.screensaver.gschema.override',
 ]
 
-custom_target('10_budgie_gnome_settings_SLE.gschema.override',
-output: '10_budgie_gnome_settings_SLE.gschema.override',
+custom_target('21_budgie_gnome_settings_SLE.gschema.override',
+output: '21_budgie_gnome_settings_SLE.gschema.override',
 capture: true,
 input: budgie_schemas,
 command: ['cat', '@INPUT@'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 

commit budgie-desktop-branding for openSUSE:Factory

2020-10-05 Thread root
Hello community,

here is the log from the commit of package budgie-desktop-branding for 
openSUSE:Factory checked in at 2020-10-05 19:39:15

Comparing /work/SRC/openSUSE:Factory/budgie-desktop-branding (Old)
 and  /work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249 (New)


Package is "budgie-desktop-branding"

Mon Oct  5 19:39:15 2020 rev:5 rq:839422 version:20201004.2

Changes:

--- 
/work/SRC/openSUSE:Factory/budgie-desktop-branding/budgie-desktop-branding.changes
  2020-09-28 14:28:44.794131071 +0200
+++ 
/work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249/budgie-desktop-branding.changes
2020-10-05 19:40:23.301625937 +0200
@@ -1,0 +2,8 @@
+Sun Oct  4 11:30:28 UTC 2020 - Callum Farmer 
+
+- Update to version 20201004.2:
+  * Add upstream branding settings
+  * Change archive structure
+- Add upstream branding package
+
+---

Old:

  budgie-desktop-branding-20200915.1.tar.gz

New:

  budgie-desktop-branding-20201004.2.tar.gz



Other differences:
--
++ budgie-desktop-branding.spec ++
--- /var/tmp/diff_new_pack.02NMAi/_old  2020-10-05 19:40:25.465628050 +0200
+++ /var/tmp/diff_new_pack.02NMAi/_new  2020-10-05 19:40:25.469628054 +0200
@@ -22,20 +22,15 @@
 %define nsuffix SLE
 %define isnot openSUSE
 %endif
-%if 0%{?sle_version} >= 150300
-%define picsize 5120x2880
-%else
-%define picsize 1920x1200
-%endif
 
 Name:   budgie-desktop-branding
-Version:20200915.1
+Version:20201004.2
 Release:0
 Summary:Branding of the Budgie Desktop Environment
 Group:  System/GUI/Other
 License:GPL-2.0-only AND CC-BY-SA-3.0
 URL:https://github.com/gmbr3/budgie-desktop-branding
-Source: budgie-desktop-branding-%{version}.tar.gz
+Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  meson
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  hicolor-icon-theme
@@ -64,35 +59,50 @@
 This package provides the %{nsuffix} look and feel for the Budgie
 desktop environment.
 
+%package upstream
+Summary:Upstream branding of the Budgie Desktop Environment
+Requires:   budgie-desktop
+Supplements:(budgie-desktop and branding-upstream)
+Conflicts:  budgie-desktop-branding
+Provides:   budgie-desktop-branding = %{version}
+Recommends: gnome-backgrounds
+Recommends: gtk3-metatheme-greybird-geeko
+Recommends: adwaita-icon-theme
+BuildArch:  noarch
+
+%description upstream
+This package provides the upstream look and feel for the Budgie
+desktop environment.
+
 
 %prep
 %setup -q -n budgie-desktop-branding-%{version}
 
 %build
-%meson
+%meson -Dversion=%{nsuffix},upstream
 %meson_build
 
 %install
 %meson_install
 %if !0%{?is_backports} && 0%{?suse_version} < 1550
-sed -e 's-5120x3200-3840x2400-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
+sed -e 's-5120x3200-3840x2400-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
 %endif
-%if 0%{?is_backports} 
-sed -e 's-openSUSE-SLE-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
-sed -e 's-openSUSE-SLE-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_settings.gschema.override
-sed -e 's-5120x3200-%{picsize}-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
+%if 0%{?is_backports} && 0%{?sle_version} < 150300
+sed -e 's-5120x2880-1920x1200-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
 %endif
-%if 0%{?sle_version} >= 150300
-sed -e 's-jpg-png-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
+%if 0%{?is_backports} && 0%{?suse_version} < 1550
+sed -e 's-png-jpg-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
 %endif
-rm 
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/budgie-%{isnot}-distributor-logo.svg
 
 %files %{nsuffix}
 %license LICENSE LICENSE.CC-BY-SA-3.0
 %doc README.md
-%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
-%{_datadir}/glib-2.0/schemas/10_budgie_settings.gschema.override
+%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_%{nsuffix}.gschema.override
 %{_datadir}/icons/hicolor/scalable/apps/budgie-%{nsuffix}-distributor-logo.svg
 
+%files upstream
+%license LICENSE LICENSE.CC-BY-SA-3.0
+%doc README.md
+%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings_upstream.gschema.override
 
 %changelog

++ budgie-desktop-branding-20200915.1.tar.gz -> 
budgie-desktop-branding-20201004.2.tar.gz ++
diff -urN '--exclude=CVS' 

commit budgie-desktop-branding for openSUSE:Factory

2020-09-28 Thread root
Hello community,

here is the log from the commit of package budgie-desktop-branding for 
openSUSE:Factory checked in at 2020-09-28 14:28:41

Comparing /work/SRC/openSUSE:Factory/budgie-desktop-branding (Old)
 and  /work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249 (New)


Package is "budgie-desktop-branding"

Mon Sep 28 14:28:41 2020 rev:4 rq:837910 version:20200915.1

Changes:

--- 
/work/SRC/openSUSE:Factory/budgie-desktop-branding/budgie-desktop-branding.changes
  2020-09-22 21:12:07.963979341 +0200
+++ 
/work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249/budgie-desktop-branding.changes
2020-09-28 14:28:44.794131071 +0200
@@ -1,0 +2,5 @@
+Sat Sep 26 12:08:24 UTC 2020 - Callum Farmer 
+
+- Extra prep for SLE 15 SP3
+
+---



Other differences:
--
++ budgie-desktop-branding.spec ++
--- /var/tmp/diff_new_pack.zQnrOh/_old  2020-09-28 14:28:45.718131871 +0200
+++ /var/tmp/diff_new_pack.zQnrOh/_new  2020-09-28 14:28:45.722131875 +0200
@@ -22,6 +22,11 @@
 %define nsuffix SLE
 %define isnot openSUSE
 %endif
+%if 0%{?sle_version} >= 150300
+%define picsize 5120x2880
+%else
+%define picsize 1920x1200
+%endif
 
 Name:   budgie-desktop-branding
 Version:20200915.1
@@ -75,7 +80,7 @@
 %if 0%{?is_backports} 
 sed -e 's-openSUSE-SLE-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
 sed -e 's-openSUSE-SLE-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_settings.gschema.override
-sed -e 's-5120x3200-1920x1200-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
+sed -e 's-5120x3200-%{picsize}-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
 %endif
 %if 0%{?sle_version} >= 150300
 sed -e 's-jpg-png-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override




commit budgie-desktop-branding for openSUSE:Factory

2020-09-22 Thread root
Hello community,

here is the log from the commit of package budgie-desktop-branding for 
openSUSE:Factory checked in at 2020-09-22 21:11:47

Comparing /work/SRC/openSUSE:Factory/budgie-desktop-branding (Old)
 and  /work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249 (New)


Package is "budgie-desktop-branding"

Tue Sep 22 21:11:47 2020 rev:3 rq:835893 version:20200915.1

Changes:

--- 
/work/SRC/openSUSE:Factory/budgie-desktop-branding/budgie-desktop-branding.changes
  2020-09-16 19:40:29.662877162 +0200
+++ 
/work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249/budgie-desktop-branding.changes
2020-09-22 21:12:07.963979341 +0200
@@ -1,0 +2,6 @@
+Sat Sep 19 15:36:23 UTC 2020 - Callum Farmer 
+
+- Prepare for SLE 15 SP3 , presume Leap 15.3 being the same
+- Removed unnecessary parts from sed expressions
+
+---



Other differences:
--
++ budgie-desktop-branding.spec ++
--- /var/tmp/diff_new_pack.Zn9gfM/_old  2020-09-22 21:12:08.719980004 +0200
+++ /var/tmp/diff_new_pack.Zn9gfM/_new  2020-09-22 21:12:08.723980007 +0200
@@ -73,9 +73,12 @@
 sed -e 's-5120x3200-3840x2400-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
 %endif
 %if 0%{?is_backports}
-sed -e 's-openSUSEdefault-SLEdefault-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
+sed -e 's-openSUSE-SLE-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
+sed -e 's-openSUSE-SLE-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_settings.gschema.override
 sed -e 's-5120x3200-1920x1200-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
-sed -e 's+openSUSE-distributor-logo+SLE-distributor-logo+g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_settings.gschema.override
+%endif
+%if 0%{?sle_version} >= 150300
+sed -e 's-jpg-png-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
 %endif
 rm 
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/budgie-%{isnot}-distributor-logo.svg
 




commit budgie-desktop-branding for openSUSE:Factory

2020-09-16 Thread root
Hello community,

here is the log from the commit of package budgie-desktop-branding for 
openSUSE:Factory checked in at 2020-09-16 19:40:17

Comparing /work/SRC/openSUSE:Factory/budgie-desktop-branding (Old)
 and  /work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249 (New)


Package is "budgie-desktop-branding"

Wed Sep 16 19:40:17 2020 rev:2 rq:834859 version:20200915.1

Changes:

--- 
/work/SRC/openSUSE:Factory/budgie-desktop-branding/budgie-desktop-branding.changes
  2020-09-15 16:28:36.378614948 +0200
+++ 
/work/SRC/openSUSE:Factory/.budgie-desktop-branding.new.4249/budgie-desktop-branding.changes
2020-09-16 19:40:29.662877162 +0200
@@ -1,0 +2,5 @@
+Wed Sep 16 10:21:03 UTC 2020 - Callum Farmer 
+
+- Fix accidental incorrect macro
+
+---



Other differences:
--
++ budgie-desktop-branding.spec ++
--- /var/tmp/diff_new_pack.qZTlkK/_old  2020-09-16 19:40:30.790878430 +0200
+++ /var/tmp/diff_new_pack.qZTlkK/_new  2020-09-16 19:40:30.794878435 +0200
@@ -69,7 +69,7 @@
 
 %install
 %meson_install
-%if !0%{?is_backports} && 0%{?sle_version} < 150300
+%if !0%{?is_backports} && 0%{?suse_version} < 1550
 sed -e 's-5120x3200-3840x2400-g' -i 
%{buildroot}%{_datadir}/glib-2.0/schemas/10_budgie_gnome_settings.gschema.override
 %endif
 %if 0%{?is_backports}