diff --git a/.gitignore b/.gitignore index 195ccee..36b10c6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ system-switch-displaymanager-1.2.tar.bz2 /system-switch-displaymanager-1.3.tar.xz /system-switch-displaymanager-1.4.tar.xz /system-switch-displaymanager-1.5.tar.xz +/system-switch-displaymanager-1.5.1.tar.xz diff --git a/sources b/sources index 29cec53..cb2dcec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a7c372976e419ec3f6bbfc446b40cdd system-switch-displaymanager-1.5.tar.xz +SHA512 (system-switch-displaymanager-1.5.1.tar.xz) = 7cedf8bf6581ef2837c7335c8208eabff3c59cc0351f71cd4a037d1c947b203dc629c30bd3fc8c3fde482d87ff1600ca095f5d59fed1e70111fc3f89cd54ffa7 diff --git a/system-switch-displaymanager-button.patch b/system-switch-displaymanager-button.patch deleted file mode 100644 index 93210b8..0000000 --- a/system-switch-displaymanager-button.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up system-switch-displaymanager-1.5/system-switch-displaymanager.glade.orig system-switch-displaymanager-1.5/system-switch-displaymanager.glade -diff -up system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py.orig system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py ---- system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py.orig 2016-06-28 18:22:38.168397142 +0200 -+++ system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py 2016-06-28 18:24:04.931153825 +0200 -@@ -87,10 +87,12 @@ class mainDialog: - - self.window = self.xml.get_widget('window') - self.image = self.xml.get_widget('Image') -+ self.okB = self.xml.get_widget("okB") - self.window.connect('delete-event', self.on_Dialog_delete_event) - self.window.connect('hide', gtk.main_quit) - self.xml.get_widget('desktopImage').set_from_file(ICONDIR+PROGNAME+'.png') - self.hydrate() -+ self.okB.set_sensitive(False) - gtk.main() - - def on_Dialog_delete_event(self, *args): -@@ -110,6 +112,7 @@ class mainDialog: - gtk.main_quit() - - def on_RB_clicked(self, button, w): -+ self.okB.set_sensitive(True) - self.image.set_from_file(ICONDIR+DISPLAYMANAGERS[w][ICON_NAME]) - self.dm = DISPLAYMANAGERS[w][OPTION_NAME] - diff --git a/system-switch-displaymanager-mesg.patch b/system-switch-displaymanager-mesg.patch deleted file mode 100644 index f9765bc..0000000 --- a/system-switch-displaymanager-mesg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up system-switch-displaymanager-1.5/system-switch-displaymanager.orig system-switch-displaymanager-1.5/system-switch-displaymanager ---- system-switch-displaymanager-1.5/system-switch-displaymanager.orig 2015-09-23 13:01:30.829002196 +0200 -+++ system-switch-displaymanager-1.5/system-switch-displaymanager 2015-09-23 13:01:06.205283179 +0200 -@@ -7,7 +7,7 @@ if [ -n "$DISPLAY" -a -z "$1" ] ; then - exec /usr/bin/pkexec $PATHDM/system-switch-displaymanager-gui.py - else - echo "Display Manager Switcher GUI is unavailable." -- echo "Please install the switch-displaymanager-gnome package or use" -+ echo "Please install the system-switch-displaymanager-gnome package or use" - echo "system-switch-displaymanager [display manager]." - exit 1 - fi diff --git a/system-switch-displaymanager-noframe.patch b/system-switch-displaymanager-noframe.patch deleted file mode 100644 index 24c2d14..0000000 --- a/system-switch-displaymanager-noframe.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up system-switch-displaymanager-1.5/system-switch-displaymanager.glade.than system-switch-displaymanager-1.5/system-switch-displaymanager.glade ---- system-switch-displaymanager-1.5/system-switch-displaymanager.glade.than 2016-06-28 17:01:19.223194967 +0200 -+++ system-switch-displaymanager-1.5/system-switch-displaymanager.glade 2016-06-28 18:04:08.239890007 +0200 -@@ -80,11 +80,32 @@ - - - -- -+ -+ True -+ -+ False -+ True -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ label_item -+ -+ -+ -+ -+ - True -- 0.019999999553 -- 0.5 -- GTK_SHADOW_ETCHED_IN -+ 6 - - - -@@ -274,28 +295,6 @@ - - - -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- label_item -- -- - - - 0 -diff -up system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py.than system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py ---- system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py.than 2016-06-28 17:01:31.517731841 +0200 -+++ system-switch-displaymanager-1.5/system-switch-displaymanager-gui.py 2016-06-28 18:18:40.863267952 +0200 -@@ -116,7 +116,7 @@ class mainDialog: - def hydrate(self): - self.window.set_title(_('Display Manager Switcher')) - self.xml.get_widget('titleLabel').set_text(TEXT) -- self.xml.get_widget('frameLabel').set_label(_('Available Display Managers')) -+ self.xml.get_widget('frameLabel').set_label('%s' % _('Available Display Managers')) - self.hydrate_dm() - - def hydrate_dm(self): diff --git a/system-switch-displaymanager-pk.patch b/system-switch-displaymanager-pk.patch deleted file mode 100644 index 98b5399..0000000 --- a/system-switch-displaymanager-pk.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up system-switch-displaymanager-1.5/Makefile.than system-switch-displaymanager-1.5/Makefile ---- system-switch-displaymanager-1.5/Makefile.than 2016-06-28 18:36:33.016187929 +0200 -+++ system-switch-displaymanager-1.5/Makefile 2016-06-28 18:36:44.838745901 +0200 -@@ -75,8 +75,8 @@ install:: backend all - install -m 0644 $(GLADES) $(DESTDIR)$(datadir)/$(NAME)/ - install -m 0755 $(HELPER) $(DESTDIR)$(datadir)/$(NAME)/ - -- @mkdir -m 0755 -p $(DESTDIR)$(sbindir) -- install -m 0755 $(SCRIPTS) $(DESTDIR)$(sbindir) -+ @mkdir -m 0755 -p $(DESTDIR)$(bindir) -+ install -m 0755 $(SCRIPTS) $(DESTDIR)$(bindir) - - @mkdir -m 0755 -p $(DESTDIR)$(datadir)/polkit-1/actions - install -m 0644 org.fedoraproject.switch.displaymanager.policy $(DESTDIR)$(datadir)/polkit-1/actions/ diff --git a/system-switch-displaymanager.spec b/system-switch-displaymanager.spec index 81cfe0f..4122619 100644 --- a/system-switch-displaymanager.spec +++ b/system-switch-displaymanager.spec @@ -1,14 +1,9 @@ Name: system-switch-displaymanager Summary: A display manager switcher for GDM, KDM, XDM, WDM, LightDM, LXDM and SDDM -Version: 1.5 -Release: 8%{?dist} -URL: http://fedoraproject.org/wiki/switch-displaymanager -Source: %{name}-%{version}.tar.xz -Patch1: system-switch-displaymanager-mesg.patch -Patch2: system-switch-displaymanager-noframe.patch -Patch3: system-switch-displaymanager-button.patch -Patch4: system-switch-displaymanager-pk.patch - +Version: 1.5.1 +Release: 1%{?dist} +URL: http://than.fedorapeople.org/system-switch-displaymanager +Source: http://than.fedorapeople.org/system-switch-displaymanager/%{name}-%{version}.tar.xz License: GPLv2+ Group: User Interface/Desktops Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -39,10 +34,6 @@ interface for the Display Manager Switcher. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build make @@ -73,6 +64,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Sat Jul 29 2017 Than Ngo - 1.5.1-1 +- release 1.5.1, fix regex error with new perl + * Thu Jul 27 2017 Fedora Release Engineering - 1.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild