March 2015 - openSUSE Commits - openSUSE Mailing Lists

commit bitstream-vera-fonts for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package bitstream-vera-fonts for openSUSE:Factory checked in at 2015-03-30 19:33:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bitstream-vera-fonts (Old) and /work/SRC/openSUSE:Factory/.bitstream-vera-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bitstream-vera-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/bitstream-vera-fonts/bitstream-vera-fonts.changes 2012-09-14 12:14:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bitstream-vera-fonts.new/bitstream-vera-fonts.changes 2015-03-30 19:33:57.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Mar 28 22:38:24 UTC 2015 - mpluskal(a)suse.com + +- Update project url +- Use url for source + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bitstream-vera-fonts.spec ++++++ --- /var/tmp/diff_new_pack.jdezAo/_old 2015-03-30 19:33:57.000000000 +0200 +++ /var/tmp/diff_new_pack.jdezAo/_new 2015-03-30 19:33:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bitstream-vera-fonts # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,28 +17,27 @@ %define fontname bitstream-vera - Name: bitstream-vera-fonts Version: 1.10 Release: 0 Summary: Bitstream Vera(tm) Truetype fonts License: SUSE-Bitstream-Vera Group: System/X11/Fonts -Url: http://www.bitstream.com -Source: ttf-%{fontname}-%{version}.tar.bz2 +Url: https://www.gnome.org/fonts/ +Source: http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/%{version}/ttf-%{… BuildRequires: fontpackages-devel -%reconfigure_fonts_prereq # FIXME: This causes a rpmlint warning; change <= to < once there's a new upstream version Obsoletes: %{fontname} <= 1.10 Provides: %{fontname} = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%reconfigure_fonts_prereq %description The package contains the "Vera" truetype fonts from Bitstream Inc. %prep -%setup -n ttf-%{fontname}-%{version} +%setup -q -n ttf-%{fontname}-%{version} %build

1 0

commit ckermit for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package ckermit for openSUSE:Factory checked in at 2015-03-30 19:33:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ckermit (Old) and /work/SRC/openSUSE:Factory/.ckermit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ckermit" Changes: -------- --- /work/SRC/openSUSE:Factory/ckermit/ckermit.changes 2014-08-20 10:51:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ckermit.new/ckermit.changes 2015-03-30 19:33:54.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Mar 28 13:52:15 UTC 2015 - mpluskal(a)suse.com + +- Use url for source +- Cleanup spec-file with spec-cleaner + +------------------------------------------------------------------- Old: ---- cku302.tar.bz2 New: ---- cku302.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ckermit.spec ++++++ --- /var/tmp/diff_new_pack.fBqTQX/_old 2015-03-30 19:33:55.000000000 +0200 +++ /var/tmp/diff_new_pack.fBqTQX/_new 2015-03-30 19:33:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ckermit # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,6 +17,17 @@ Name: ckermit +Version: 9.0.302 +Release: 0 +Summary: A Combined Serial and Network Communication Software Package +License: BSD-3-Clause +Group: Hardware/Modem +Url: http://www.kermitproject.org/ +Source0: ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz +Patch0: decl-definition-conflict.patch +BuildRequires: ncurses-devel +Provides: kermit +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?rhel_version} BuildRequires: zsh %else @@ -25,17 +36,6 @@ %if 0%{?suse_version} >= 1130 || 0%{?fedora_version} || 0%{?mandriva_version} BuildRequires: lockdev-devel %endif -BuildRequires: ncurses-devel -Summary: A Combined Serial and Network Communication Software Package -License: BSD-3-Clause -Group: Hardware/Modem -Provides: kermit -Version: 9.0.302 -Release: 0.0 -Url: http://www.kermitproject.org/ -Source: cku302.tar.bz2 -Patch: decl-definition-conflict.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description C-Kermit is a combined serial and network communication software @@ -55,29 +55,26 @@ %prep %setup -q -c -%patch -p1 +%patch0 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS" -make linux +make %{?_smp_mflags} linux %install -install -d -m 755 $RPM_BUILD_ROOT/usr/bin -install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 755 wermit $RPM_BUILD_ROOT/usr/bin/kermit -install -m 644 ckuker.nr $RPM_BUILD_ROOT%{_mandir}/man1/kermit.1 -cd $RPM_BUILD_ROOT%{_mandir}/man1 +install -d -m 755 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_mandir}/man1 +install -m 755 wermit %{buildroot}%{_bindir}/kermit +install -m 644 ckuker.nr %{buildroot}%{_mandir}/man1/kermit.1 +cd %{buildroot}%{_mandir}/man1 ln -s kermit.1 ckermit.1 -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc COPYING.TXT %{_mandir}/man1/* -/usr/bin/* +%{_bindir}/* %files doc %defattr(-,root,root)

1 0

commit prboom-plus for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package prboom-plus for openSUSE:Factory checked in at 2015-03-30 19:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prboom-plus (Old) and /work/SRC/openSUSE:Factory/.prboom-plus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "prboom-plus" Changes: -------- --- /work/SRC/openSUSE:Factory/prboom-plus/prboom-plus.changes 2013-11-13 10:17:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.prboom-plus.new/prboom-plus.changes 2015-03-30 19:33:52.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Mar 29 19:19:54 UTC 2015 - jengelh(a)inai.de + +- Avoid strange inequality in Provides tag + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prboom-plus.spec ++++++ --- /var/tmp/diff_new_pack.iFoOBY/_old 2015-03-30 19:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.iFoOBY/_new 2015-03-30 19:33:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package prboom-plus # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -24,8 +24,7 @@ Group: Amusements/Games/3D/Shoot Url: http://prboom-plus.sourceforge.net/ -#SVN-Clone: http://crowproductions.de/repos/prboom/branches/prboom-plus-24/prboom2/ -#Freecode-URL: http://freecode.com/projects/prboom-plus +#SVN-Clone: https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2 #DL-URL: http://downloads.sf.net/prboom-plus/prboom-plus-2.5.1.3.tar.gz Source: %name-%version.tar.xz Patch1: prboom-nodatetime.diff @@ -47,7 +46,7 @@ BuildRequires: pcre-devel BuildRequires: xz Suggests: freedoom -Provides: prboom > 2.5.0 +Provides: prboom = 2.5.0plus Obsoletes: prboom <= 2.5.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit folder-color for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package folder-color for openSUSE:Factory checked in at 2015-03-30 19:33:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/folder-color (Old) and /work/SRC/openSUSE:Factory/.folder-color.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "folder-color" Changes: -------- --- /work/SRC/openSUSE:Factory/folder-color/folder-color.changes 2015-03-23 12:17:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.folder-color.new/folder-color.changes 2015-03-30 19:33:50.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Mar 29 13:06:32 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 0.0.70: + * Fix no transparency in custom colours. + * Update translations. + +------------------------------------------------------------------- Old: ---- folder-color-caja_0.0.62_all.tar.gz folder-color-common_0.0.60_all.tar.gz folder-color_0.0.62_all.tar.gz New: ---- folder-color-caja_0.0.70_all.tar.gz folder-color-common_0.0.70_all.tar.gz folder-color_0.0.70_all.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ folder-color.spec ++++++ --- /var/tmp/diff_new_pack.ZQcWIN/_old 2015-03-30 19:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ZQcWIN/_new 2015-03-30 19:33:51.000000000 +0200 @@ -17,16 +17,15 @@ %define _name folder_color -%define _version 0.0.6x -%define _common_ver 0.0.60 +%define _version 0.0.7x Name: folder-color -Version: 0.0.62 +Version: 0.0.70 Release: 0 Summary: Change a directory colour in Caja and Nautilus License: GPL-3.0+ Group: Productivity/File utilities Url: https://launchpad.net/folder-color -Source0: https://launchpad.net/%{name}/trunk/%{_version}/+download/%{name}-common_%{… +Source0: https://launchpad.net/%{name}/trunk/%{_version}/+download/%{name}-common_%{… Source1: https://launchpad.net/%{name}/trunk/%{_version}/+download/%{name}-caja_%{ve… Source2: https://launchpad.net/%{name}/trunk/%{_version}/+download/%{name}_%{version… BuildRequires: fdupes ++++++ folder-color-caja_0.0.62_all.tar.gz -> folder-color-caja_0.0.70_all.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/caja-extension/folder-color.py new/folder-color-caja/caja-extension/folder-color.py --- old/folder-color-caja/caja-extension/folder-color.py 2015-03-18 19:42:06.000000000 +0100 +++ new/folder-color-caja/caja-extension/folder-color.py 2015-03-29 12:04:42.000000000 +0200 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Folder Color 0.0.62 +# Folder Color 0.0.70 # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # Folder Color is free software; you can redistribute it and/or modify @@ -67,8 +67,7 @@ self.HIDE_DONATION = os.path.join(self.CFG_PATH, 'hide_donation') self.URL_DONATE = 'http://gufw.org/donate_foldercolor' - self.GRADIENT_MIDDLE_RANGE = 2500 - self.GRADIENT_DARK_RANGE = 5000 + self.GRADIENT_RANGE = 15 self.VALUE_LIGHT = 'value_light' self.VALUE_MIDDLE = 'value_middle' self.VALUE_DARK = 'value_dark' @@ -241,28 +240,43 @@ def custom_color_dialog(self): """Shows the dialog and return the color""" - colorselectiondialog = Gtk.ColorSelectionDialog(_("Choose a Folder Color")) - selector = colorselectiondialog.get_color_selection() - response = colorselectiondialog.run() - colorselectiondialog.destroy() + dialog = Gtk.ColorSelectionDialog() + response = dialog.run() if response == Gtk.ResponseType.OK: - color = selector.get_current_color() - # Control max color range - if color.red <= self.GRADIENT_DARK_RANGE: - color.red = self.GRADIENT_DARK_RANGE - if color.green <= self.GRADIENT_DARK_RANGE: - color.green = self.GRADIENT_DARK_RANGE - if color.blue <= self.GRADIENT_DARK_RANGE: - color.blue = self.GRADIENT_DARK_RANGE - # Convert to hex - rgb_ligth = (color.red, color.green, color.blue) - rgb_middle = (color.red-self.GRADIENT_MIDDLE_RANGE, color.green-self.GRADIENT_MIDDLE_RANGE, color.blue-self.GRADIENT_MIDDLE_RANGE) - rgb_dark = (color.red-self.GRADIENT_DARK_RANGE, color.green-self.GRADIENT_DARK_RANGE, color.blue-self.GRADIENT_DARK_RANGE) - htmlcolor_light = ''.join((str(hex(i/257))[2:].rjust(2, '0') for i in rgb_ligth)).upper() - htmlcolor_middle = ''.join((str(hex(i/257))[2:].rjust(2, '0') for i in rgb_middle)).upper() - htmlcolor_dark = ''.join((str(hex(i/257))[2:].rjust(2, '0') for i in rgb_dark)).upper() - return (htmlcolor_light, htmlcolor_middle, htmlcolor_dark) + # Color + color = dialog.get_color_selection().get_current_color() + dialog.destroy() + red = int(color.red / 256) + green = int(color.green / 256) + blue = int(color.blue / 256) + # Light + hex_light = "%02x%02x%02x" % (red, green, blue) + # Middle + red = red - self.GRADIENT_RANGE + if red < 0: + red = 0 + green = green - self.GRADIENT_RANGE + if green < 0: + green = 0 + blue = blue - self.GRADIENT_RANGE + if blue < 0: + blue = 0 + hex_middle = "%02x%02x%02x" % (red, green, blue) + # Dark + red = red - self.GRADIENT_RANGE + if red < 0: + red = 0 + green = green - self.GRADIENT_RANGE + if green < 0: + green = 0 + blue = blue - self.GRADIENT_RANGE + if blue < 0: + blue = 0 + hex_dark = "%02x%02x%02x" % (red, green, blue) + return (hex_light, hex_middle, hex_dark) + + dialog.destroy() return None def _generate_custom_file(self, src_file, dst_file, colors): @@ -279,7 +293,7 @@ def __init__(self): self.foldercolor = FolderColor() self.lock = Lock() - self.switcher = Switcher() + self.globalcolor = GlobalColor() dummy_i18n = (_("Brown"), _("Blue"), _("Green"), _("Grey"), _("Orange"), _("Pink"), _("Red"), _("Purple"), _("Yellow"), _("Favorite"), _("Finished"), _("Important"), _("In Progress")) # Need i18n, because colors/emblems are dynamic now @@ -463,35 +477,21 @@ label = Gtk.Label(_("Global Color:")) button = Gtk.Button(_("Apply")) button.connect('clicked', self._on_color_changed) - exp1 = Gtk.AspectFrame() - exp1.set_shadow_type(0) - exp2 = Gtk.AspectFrame() - exp2.set_shadow_type(0) - hbox.pack_start(exp1, True, True, 0) hbox.pack_start(label, False, False, 0) hbox.pack_start(self.cb_colors, False, False, 0) hbox.pack_start(button, False, False, 0) - hbox.pack_start(exp2, True, True, 0) vbox.pack_start(hbox, False, False, 0) - - label = Gtk.Label(_("(You may need to restart the file manager)")) - label.set_justify(Gtk.Justification.LEFT) - vbox.pack_start(label, True, True, 0) - # Donate if not os.path.exists(self.foldercolor.HIDE_DONATION): self.vbox_donate = Gtk.VBox(spacing=6) - self.vbox_donate.pack_start(Gtk.HSeparator(), False, True, 6) + self.vbox_donate.pack_start(Gtk.HSeparator(), True, True, 0) + link_donate = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Donate? Click to hide")) + link_donate.set_tooltip_text(_("Thanks in advance!")) + link_donate.connect("clicked", self._on_donate_hide) hbox = Gtk.HBox(spacing=6) - btn_donate = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Suppport this app with a donation")) - img_hide = Gtk.Image(stock=Gtk.STOCK_CLOSE) - btn_hide = Gtk.Button(image=img_hide) - btn_hide.connect("clicked", self._on_donate_hide) - btn_hide.set_tooltip_text(_("Hide donation forever")) - hbox.pack_start(btn_donate, False, False, 0) - hbox.pack_start(btn_hide, False, False, 0) - self.vbox_donate.pack_start(hbox, False, False, 0) - vbox.pack_start(self.vbox_donate, False, False, 0) + hbox.pack_start(link_donate, True, True, 0) + self.vbox_donate.pack_start(hbox, True, True, 0) + vbox.pack_start(self.vbox_donate, True, True, 0) win.add(vbox) win.connect('delete-event', self._close_win) @@ -521,9 +521,9 @@ return if color == 'default': - self.switcher.restore() + self.globalcolor.restore() else: - self.switcher.set_color(color) + self.globalcolor.set_color(color) class Lock: @@ -553,7 +553,7 @@ return False -class Switcher: +class GlobalColor: """Set default global color""" def __init__(self): self.foldercolor = FolderColor() @@ -592,13 +592,30 @@ return cfg.get(section, 'Inherits') return '' + def _cp_file(self, src, dst): + if os.path.isfile(src): + try: + shutil.copy2(src, dst) + except: + pass + def _generate_local_theme(self, name, inherit, color): """Generate a inherit local theme from system theme""" # Create folder name = '.'.join([name, 'foldercolor']) # Generate a Folder Color theme try: dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places') - os.makedirs(dst_path) + if not os.path.exists(dst_path): + os.makedirs(dst_path) + dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, '16x16', 'places') + if not os.path.exists(dst_path): + os.makedirs(dst_path) + dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, '22x22', 'places') + if not os.path.exists(dst_path): + os.makedirs(dst_path) + dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, '24x24', 'places') + if not os.path.exists(dst_path): + os.makedirs(dst_path) except OSError as exception: pass except: @@ -606,24 +623,135 @@ # Generate icons for folder in self.foldercolor.DEFAULT_FOLDERS: + # scalable src_file = ''.join([self.foldercolor.get_path(), self.foldercolor.get_iconname(folder, color), '.svg']) dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(folder)) - shutil.copy2(src_file, dst_file) + self._cp_file(src_file, dst_file) + # 16x16 + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('/scalable/', '/16x16/') + self._cp_file(src_file_16, dst_file_16) + # 22x22 + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('/scalable/', '/22x22/') + self._cp_file(src_file_22, dst_file_22) + # 24x24 + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('/scalable/', '/24x24/') + self._cp_file(src_file_24, dst_file_24) + + # folder.svg src_file = ''.join([self.foldercolor.get_path(), self.foldercolor.get_iconname('', color), '.svg']) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 0)) # folder.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 1)) # inode-directory.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 2)) # user-home.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 3)) # folder_home.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 4)) # network-workgroup.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 5)) # folder-remote.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 6)) # document-open-recent.svg - shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 0)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # inode-directory.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 1)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # user-home.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 2)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # folder_home.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 3)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # network-workgroup.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 4)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # folder-remote.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 5)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # document-open-recent.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 6)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) # Generate index.theme index_file = '/'.join([os.path.join(self.foldercolor.USER_PATH_THEME, name), 'index.theme']) @@ -634,13 +762,23 @@ cfg.set('Icon Theme', 'Hidden', 'true') cfg.set('Icon Theme', 'Comment', 'Generated by Folder Color') cfg.set('Icon Theme', 'Inherits', inherit) - cfg.set('Icon Theme', 'Directories', 'scalable/places') + cfg.set('Icon Theme', 'Directories', 'scalable/places,16x16/places,22x22/places,24x24/places') cfg.add_section('scalable/places') - cfg.set('scalable/places', 'MinSize', '16') cfg.set('scalable/places', 'Size', '48') - cfg.set('scalable/places', 'MaxSize', '256') cfg.set('scalable/places', 'Context', 'Places') cfg.set('scalable/places', 'Type', 'Scalable') + cfg.add_section('16x16/places') + cfg.set('16x16/places', 'Size', '16') + cfg.set('16x16/places', 'Context', 'Places') + cfg.set('16x16/places', 'Type', 'Threshold') + cfg.add_section('22x22/places') + cfg.set('22x22/places', 'Size', '22') + cfg.set('22x22/places', 'Context', 'Places') + cfg.set('22x22/places', 'Type', 'Threshold') + cfg.add_section('24x24/places') + cfg.set('24x24/places', 'Size', '24') + cfg.set('24x24/places', 'Context', 'Places') + cfg.set('24x24/places', 'Type', 'Threshold') f = open(index_file, 'w') cfg.write(f) f.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/debian/changelog new/folder-color-caja/debian/changelog --- old/folder-color-caja/debian/changelog 2015-03-18 19:42:07.000000000 +0100 +++ new/folder-color-caja/debian/changelog 2015-03-29 12:04:42.000000000 +0200 @@ -1,10 +1,7 @@ -folder-color-caja (0.0.62) trusty; urgency=low +folder-color-caja (0.0.70) trusty; urgency=low - * Allow local themes - * Fixed folders network and recent - * Allow to hide donation - * Layout in Global color fixed + * Fixed #1437800: No transparency in custom colors * Updated translations - -- costales <costales.marcos(a)gmail.com> Web, 18 Mar 2015 19:02:31 +0000 + -- costales <costales.marcos(a)gmail.com> Sat, 28 Mar 2015 18:12:31 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/debian/control new/folder-color-caja/debian/control --- old/folder-color-caja/debian/control 2015-03-18 19:42:07.000000000 +0100 +++ new/folder-color-caja/debian/control 2015-03-29 12:04:42.000000000 +0200 @@ -1,7 +1,7 @@ Source: folder-color-caja Section: utils Priority: extra -Standards-Version: 0.0.62 +Standards-Version: 0.0.70 Maintainer: costales <costales.marcos(a)gmail.com> Build-Depends: python-distutils-extra, debhelper (>=7) Homepage: https://code.launchpad.net/folder-color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/setup.py new/folder-color-caja/setup.py --- old/folder-color-caja/setup.py 2015-03-18 19:42:06.000000000 +0100 +++ new/folder-color-caja/setup.py 2015-03-29 12:04:41.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Folder Color 0.0.62 - http://launchpad.net/folder-color +# Folder Color 0.0.70 - http://launchpad.net/folder-color # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # folder-color is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ # Setup stage DistUtilsExtra.auto.setup( name = "folder-color-caja", - version = "0.0.62", + version = "0.0.70", description = "Change your folder color in Caja", author = "Marcos Alvarez Costales https://launchpad.net/~costales", author_email = "https://launchpad.net/~costales", ++++++ folder-color-common_0.0.60_all.tar.gz -> folder-color-common_0.0.70_all.tar.gz ++++++ ++++ 16614 lines of diff (skipped) ++++++ folder-color_0.0.62_all.tar.gz -> folder-color_0.0.70_all.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/debian/changelog new/folder-color/debian/changelog --- old/folder-color/debian/changelog 2015-03-18 19:41:59.000000000 +0100 +++ new/folder-color/debian/changelog 2015-03-29 12:04:28.000000000 +0200 @@ -1,10 +1,7 @@ -folder-color (0.0.62) trusty; urgency=low +folder-color (0.0.70) trusty; urgency=low - * Allow local themes - * Fixed folders network and recent - * Allow to hide donation - * Layout in Global color fixed + * Fixed #1437800: No transparency in custom colors * Updated translations - -- costales <costales.marcos(a)gmail.com> Web, 18 Mar 2015 19:02:31 +0000 + -- costales <costales.marcos(a)gmail.com> Sat, 28 Mar 2015 18:12:31 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/debian/control new/folder-color/debian/control --- old/folder-color/debian/control 2015-03-18 19:41:59.000000000 +0100 +++ new/folder-color/debian/control 2015-03-29 12:04:28.000000000 +0200 @@ -1,7 +1,7 @@ Source: folder-color Section: utils Priority: extra -Standards-Version: 0.0.62 +Standards-Version: 0.0.70 Maintainer: costales <costales.marcos(a)gmail.com> Build-Depends: python-distutils-extra, debhelper (>=7) Homepage: https://code.launchpad.net/folder-color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/nautilus-extension/folder-color.py new/folder-color/nautilus-extension/folder-color.py --- old/folder-color/nautilus-extension/folder-color.py 2015-03-18 19:41:35.000000000 +0100 +++ new/folder-color/nautilus-extension/folder-color.py 2015-03-29 12:03:51.000000000 +0200 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Folder Color 0.0.62 +# Folder Color 0.0.70 # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # Folder Color is free software; you can redistribute it and/or modify @@ -67,8 +67,7 @@ self.HIDE_DONATION = os.path.join(self.CFG_PATH, 'hide_donation') self.URL_DONATE = 'http://gufw.org/donate_foldercolor' - self.GRADIENT_MIDDLE_RANGE = 2500 - self.GRADIENT_DARK_RANGE = 5000 + self.GRADIENT_RANGE = 15 self.VALUE_LIGHT = 'value_light' self.VALUE_MIDDLE = 'value_middle' self.VALUE_DARK = 'value_dark' @@ -241,28 +240,43 @@ def custom_color_dialog(self): """Shows the dialog and return the color""" - colorselectiondialog = Gtk.ColorSelectionDialog(_("Choose a Folder Color")) - selector = colorselectiondialog.get_color_selection() - response = colorselectiondialog.run() - colorselectiondialog.destroy() - + dialog = Gtk.ColorChooserDialog() + dialog.set_use_alpha(False) + response = dialog.run() if response == Gtk.ResponseType.OK: - color = selector.get_current_color() - # Control max color range - if color.red <= self.GRADIENT_DARK_RANGE: - color.red = self.GRADIENT_DARK_RANGE - if color.green <= self.GRADIENT_DARK_RANGE: - color.green = self.GRADIENT_DARK_RANGE - if color.blue <= self.GRADIENT_DARK_RANGE: - color.blue = self.GRADIENT_DARK_RANGE - # Convert to hex - rgb_ligth = (color.red, color.green, color.blue) - rgb_middle = (color.red-self.GRADIENT_MIDDLE_RANGE, color.green-self.GRADIENT_MIDDLE_RANGE, color.blue-self.GRADIENT_MIDDLE_RANGE) - rgb_dark = (color.red-self.GRADIENT_DARK_RANGE, color.green-self.GRADIENT_DARK_RANGE, color.blue-self.GRADIENT_DARK_RANGE) - htmlcolor_light = ''.join((str(hex(i/257))[2:].rjust(2, '0') for i in rgb_ligth)).upper() - htmlcolor_middle = ''.join((str(hex(i/257))[2:].rjust(2, '0') for i in rgb_middle)).upper() - htmlcolor_dark = ''.join((str(hex(i/257))[2:].rjust(2, '0') for i in rgb_dark)).upper() - return (htmlcolor_light, htmlcolor_middle, htmlcolor_dark) + # Color + color = dialog.get_rgba() + dialog.destroy() + red = (color.red * 255) + green = (color.green * 255) + blue = (color.blue * 255) + # Light + hex_light = "%02x%02x%02x" % (red, green, blue) + # Middle + red = red - self.GRADIENT_RANGE + if red < 0: + red = 0 + green = green - self.GRADIENT_RANGE + if green < 0: + green = 0 + blue = blue - self.GRADIENT_RANGE + if blue < 0: + blue = 0 + hex_middle = "%02x%02x%02x" % (red, green, blue) + # Dark + red = red - self.GRADIENT_RANGE + if red < 0: + red = 0 + green = green - self.GRADIENT_RANGE + if green < 0: + green = 0 + blue = blue - self.GRADIENT_RANGE + if blue < 0: + blue = 0 + hex_dark = "%02x%02x%02x" % (red, green, blue) + return (hex_light, hex_middle, hex_dark) + + dialog.destroy() return None def _generate_custom_file(self, src_file, dst_file, colors): @@ -279,7 +293,7 @@ def __init__(self): self.foldercolor = FolderColor() self.lock = Lock() - self.switcher = Switcher() + self.globalcolor = GlobalColor() dummy_i18n = (_("Brown"), _("Blue"), _("Green"), _("Grey"), _("Orange"), _("Pink"), _("Red"), _("Purple"), _("Yellow"), _("Favorite"), _("Finished"), _("Important"), _("In Progress")) # Need i18n, because colors/emblems are dynamic now @@ -463,35 +477,21 @@ label = Gtk.Label(_("Global Color:")) button = Gtk.Button(_("Apply")) button.connect('clicked', self._on_color_changed) - exp1 = Gtk.AspectFrame() - exp1.set_shadow_type(0) - exp2 = Gtk.AspectFrame() - exp2.set_shadow_type(0) - hbox.pack_start(exp1, True, True, 0) hbox.pack_start(label, False, False, 0) hbox.pack_start(self.cb_colors, False, False, 0) hbox.pack_start(button, False, False, 0) - hbox.pack_start(exp2, True, True, 0) vbox.pack_start(hbox, False, False, 0) - - label = Gtk.Label(_("(You may need to restart the file manager)")) - label.set_justify(Gtk.Justification.LEFT) - vbox.pack_start(label, True, True, 0) - # Donate if not os.path.exists(self.foldercolor.HIDE_DONATION): self.vbox_donate = Gtk.VBox(spacing=6) - self.vbox_donate.pack_start(Gtk.HSeparator(), False, True, 6) + self.vbox_donate.pack_start(Gtk.HSeparator(), True, True, 0) + link_donate = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Donate? Click to hide")) + link_donate.set_tooltip_text(_("Thanks in advance!")) + link_donate.connect("clicked", self._on_donate_hide) hbox = Gtk.HBox(spacing=6) - btn_donate = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Suppport this app with a donation")) - img_hide = Gtk.Image(stock=Gtk.STOCK_CLOSE) - btn_hide = Gtk.Button(image=img_hide) - btn_hide.connect("clicked", self._on_donate_hide) - btn_hide.set_tooltip_text(_("Hide donation forever")) - hbox.pack_start(btn_donate, False, False, 0) - hbox.pack_start(btn_hide, False, False, 0) - self.vbox_donate.pack_start(hbox, False, False, 0) - vbox.pack_start(self.vbox_donate, False, False, 0) + hbox.pack_start(link_donate, True, True, 0) + self.vbox_donate.pack_start(hbox, True, True, 0) + vbox.pack_start(self.vbox_donate, True, True, 0) win.add(vbox) win.connect('delete-event', self._close_win) @@ -521,9 +521,9 @@ return if color == 'default': - self.switcher.restore() + self.globalcolor.restore() else: - self.switcher.set_color(color) + self.globalcolor.set_color(color) class Lock: @@ -553,7 +553,7 @@ return False -class Switcher: +class GlobalColor: """Set default global color""" def __init__(self): self.foldercolor = FolderColor() @@ -592,13 +592,30 @@ return cfg.get(section, 'Inherits') return '' + def _cp_file(self, src, dst): + if os.path.isfile(src): + try: + shutil.copy2(src, dst) + except: + pass + def _generate_local_theme(self, name, inherit, color): """Generate a inherit local theme from system theme""" # Create folder name = '.'.join([name, 'foldercolor']) # Generate a Folder Color theme try: dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places') - os.makedirs(dst_path) + if not os.path.exists(dst_path): + os.makedirs(dst_path) + dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, '16x16', 'places') + if not os.path.exists(dst_path): + os.makedirs(dst_path) + dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, '22x22', 'places') + if not os.path.exists(dst_path): + os.makedirs(dst_path) + dst_path = os.path.join(self.foldercolor.USER_PATH_THEME, name, '24x24', 'places') + if not os.path.exists(dst_path): + os.makedirs(dst_path) except OSError as exception: pass except: @@ -606,24 +623,135 @@ # Generate icons for folder in self.foldercolor.DEFAULT_FOLDERS: + # scalable src_file = ''.join([self.foldercolor.get_path(), self.foldercolor.get_iconname(folder, color), '.svg']) dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(folder)) - shutil.copy2(src_file, dst_file) + self._cp_file(src_file, dst_file) + # 16x16 + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('/scalable/', '/16x16/') + self._cp_file(src_file_16, dst_file_16) + # 22x22 + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('/scalable/', '/22x22/') + self._cp_file(src_file_22, dst_file_22) + # 24x24 + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('/scalable/', '/24x24/') + self._cp_file(src_file_24, dst_file_24) + + # folder.svg src_file = ''.join([self.foldercolor.get_path(), self.foldercolor.get_iconname('', color), '.svg']) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 0)) # folder.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 1)) # inode-directory.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 2)) # user-home.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 3)) # folder_home.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 4)) # network-workgroup.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 5)) # folder-remote.svg - shutil.copy2(src_file, dst_file) - dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 6)) # document-open-recent.svg - shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 0)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # inode-directory.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 1)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # user-home.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 2)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # folder_home.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 3)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # network-workgroup.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 4)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # folder-remote.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 5)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) + + # document-open-recent.svg + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 6)) + self._cp_file(src_file, dst_file) + + src_file_16 = src_file.replace('/48', '/16').replace('48/', '16/') + dst_file_16 = dst_file.replace('scalable', '16x16') + self._cp_file(src_file_16, dst_file_16) + + src_file_22 = src_file.replace('/48', '/22').replace('48/', '22/') + dst_file_22 = dst_file.replace('scalable', '22x22') + self._cp_file(src_file_22, dst_file_22) + + src_file_24 = src_file.replace('/48', '/24').replace('48/', '24/') + dst_file_24 = dst_file.replace('scalable', '24x24') + self._cp_file(src_file_24, dst_file_24) # Generate index.theme index_file = '/'.join([os.path.join(self.foldercolor.USER_PATH_THEME, name), 'index.theme']) @@ -634,13 +762,23 @@ cfg.set('Icon Theme', 'Hidden', 'true') cfg.set('Icon Theme', 'Comment', 'Generated by Folder Color') cfg.set('Icon Theme', 'Inherits', inherit) - cfg.set('Icon Theme', 'Directories', 'scalable/places') + cfg.set('Icon Theme', 'Directories', 'scalable/places,16x16/places,22x22/places,24x24/places') cfg.add_section('scalable/places') - cfg.set('scalable/places', 'MinSize', '16') cfg.set('scalable/places', 'Size', '48') - cfg.set('scalable/places', 'MaxSize', '256') cfg.set('scalable/places', 'Context', 'Places') cfg.set('scalable/places', 'Type', 'Scalable') + cfg.add_section('16x16/places') + cfg.set('16x16/places', 'Size', '16') + cfg.set('16x16/places', 'Context', 'Places') + cfg.set('16x16/places', 'Type', 'Threshold') + cfg.add_section('22x22/places') + cfg.set('22x22/places', 'Size', '22') + cfg.set('22x22/places', 'Context', 'Places') + cfg.set('22x22/places', 'Type', 'Threshold') + cfg.add_section('24x24/places') + cfg.set('24x24/places', 'Size', '24') + cfg.set('24x24/places', 'Context', 'Places') + cfg.set('24x24/places', 'Type', 'Threshold') f = open(index_file, 'w') cfg.write(f) f.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/setup.py new/folder-color/setup.py --- old/folder-color/setup.py 2015-03-18 19:41:59.000000000 +0100 +++ new/folder-color/setup.py 2015-03-29 12:04:28.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Folder Color 0.0.62 - http://launchpad.net/folder-color +# Folder Color 0.0.70 - http://launchpad.net/folder-color # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # folder-color is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ # Setup stage DistUtilsExtra.auto.setup( name = "folder-color", - version = "0.0.62", + version = "0.0.70", description = "Change your folder color in Nautilus", author = "Marcos Alvarez Costales https://launchpad.net/~costales", author_email = "https://launchpad.net/~costales",

1 0

commit perl-Statistics-Descriptive for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package perl-Statistics-Descriptive for openSUSE:Factory checked in at 2015-03-30 19:33:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Statistics-Descriptive (Old) and /work/SRC/openSUSE:Factory/.perl-Statistics-Descriptive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Statistics-Descriptive" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Statistics-Descriptive/perl-Statistics-Descriptive.changes 2015-02-08 11:42:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Statistics-Descriptive.new/perl-Statistics-Descriptive.changes 2015-03-30 19:33:47.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 27 14:29:11 UTC 2015 - stephan.barth(a)suse.com + +- Fixed broken link. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Statistics-Descriptive.spec ++++++ --- /var/tmp/diff_new_pack.guCOrc/_old 2015-03-30 19:33:48.000000000 +0200 +++ /var/tmp/diff_new_pack.guCOrc/_new 2015-03-30 19:33:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Statistics-Descriptive # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -20,7 +20,7 @@ Version: 3.0608 Release: 0 %define cpan_name Statistics-Descriptive -Summary: Module of basic descriptive statistical functions. +Summary: Module of basic descriptive statistical functions License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Statistics-Descriptive/

1 0

commit plasma5-workspace for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2015-03-30 19:33:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2015-03-27 09:40:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2015-03-30 19:33:46.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 27 17:09:18 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Added 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch + (kde#339323, kde#340549, boo#924074) + +------------------------------------------------------------------- New: ---- 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.fSt1RZ/_old 2015-03-30 19:33:47.000000000 +0200 +++ /var/tmp/diff_new_pack.fSt1RZ/_new 2015-03-30 19:33:47.000000000 +0200 @@ -35,6 +35,7 @@ # PATCHES 100-1000 and above are from upstream 5.2 branch Patch100: 0001-Workaround-the-lockscreen-password-field-focus-issue.patch # PATCHES 1000 and above are from upstream master/5.3 branch +Patch1000: 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= %{version} BuildRequires: kactivities5-devel >= 5.6.0 @@ -187,6 +188,7 @@ %patch1 -p1 %patch2 -p1 %patch100 -p1 +%patch1000 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch ++++++ >From e4c083449aee849cf316f9bd18b06e2d37684608 Mon Sep 17 00:00:00 2001 From: Bhushan Shah <bhush94(a)gmail.com> Date: Thu, 26 Mar 2015 21:20:11 +0530 Subject: [PATCH 1/1] Fix one pixel gap between screenedge and right placed vertical panel Appearantly right() / bottomRight() / topRight() returns values with 1 pixel x off for historical reasons and hence 1px gap. This causes the autohide panel not hiding automatically. BUG: 339323 BUG: 340549 FIXED-IN: 5.3 REVIEW: 123136 (cherry picked from commit 975e5009c176eb378daa5c8f74cd4cffb64ff459) --- shell/panelview.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/shell/panelview.cpp b/shell/panelview.cpp index 48687ba5c2e8d41722fe3be1d078319019cb4d0b..d934da1aeb0c13da0ec25d55e32528635bd135ad 100644 --- a/shell/panelview.cpp +++ b/shell/panelview.cpp @@ -426,7 +426,7 @@ QRect PanelView::geometryByDistance(int distance) const position = QPoint(QPoint(s->geometry().center().x(), s->geometry().top()) + QPoint(m_offset - size().width()/2, distance)); break; case Qt::AlignRight: - position = QPoint(s->geometry().topRight() - QPoint(m_offset + size().width(), distance)); + position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y()) - QPoint(m_offset + size().width(), distance)); break; case Qt::AlignLeft: default: @@ -440,7 +440,7 @@ QRect PanelView::geometryByDistance(int distance) const position = QPoint(QPoint(s->geometry().left(), s->geometry().center().y()) + QPoint(distance, m_offset - size().height()/2)); break; case Qt::AlignRight: - position = QPoint(s->geometry().bottomLeft() - QPoint(distance, m_offset + size().height())); + position = QPoint(QPoint(s->geometry().left(), s->geometry().y() + s->geometry().height()) - QPoint(distance, m_offset + size().height())); break; case Qt::AlignLeft: default: @@ -451,14 +451,15 @@ QRect PanelView::geometryByDistance(int distance) const case Plasma::Types::RightEdge: switch (m_alignment) { case Qt::AlignCenter: - position = QPoint(QPoint(s->geometry().right(), s->geometry().center().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset - size().height()/2)); + // Never use rect.right(); for historical reasons it returns left() + width() - 1; see http://doc.qt.io/qt-5/qrect.html#right + position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().center().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset - size().height()/2)); break; case Qt::AlignRight: - position = QPoint(s->geometry().bottomRight() - QPoint(thickness() + distance, 0) - QPoint(0, m_offset + size().height())); + position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y() + s->geometry().height()) - QPoint(thickness() + distance, 0) - QPoint(0, m_offset + size().height())); break; case Qt::AlignLeft: default: - position = QPoint(s->geometry().topRight() - QPoint(thickness() + distance, 0) + QPoint(0, m_offset)); + position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset)); } break; -- 2.3.3

1 0

commit telepathy-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package telepathy-qt5 for openSUSE:Factory checked in at 2015-03-30 19:33:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt5 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt5/telepathy-qt5.changes 2014-09-10 17:03:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-qt5.new/telepathy-qt5.changes 2015-03-30 19:33:45.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Mar 29 10:55:16 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Add-missing-QObject-include.patch: fixed build with Qt 5.5 + +------------------------------------------------------------------- +Mon Dec 15 16:29:49 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added add-the-telepathy-qt-include.patch + +------------------------------------------------------------------- New: ---- Add-missing-QObject-include.patch add-the-telepathy-qt-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt5.spec ++++++ --- /var/tmp/diff_new_pack.cyOLlF/_old 2015-03-30 19:33:46.000000000 +0200 +++ /var/tmp/diff_new_pack.cyOLlF/_new 2015-03-30 19:33:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package telepathy-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -28,6 +28,10 @@ Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{versi… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM add-the-telepathy-qt-include.patch +Patch0: add-the-telepathy-qt-include.patch +# PATCH-FIX-UPSTREAM Add-missing-QObject-include.patch +Patch1: Add-missing-QObject-include.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: fdupes @@ -81,6 +85,8 @@ %prep %setup -q -n telepathy-qt-%{version} +%patch0 -p1 +%patch1 -p1 %build if [ %{_lib} = lib64 ]; then ++++++ Add-missing-QObject-include.patch ++++++ >From 494a955128a193382a698ee3d71071d8ff8388e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Benoit?= <r3m1.benoit(a)gmail.com> Date: Fri, 27 Mar 2015 12:57:54 +0100 Subject: Add missing QObject include Needed to build against Qt 5.5 as QStringList doesn't include QObject anymore. diff --git a/TelepathyQt/readiness-helper.h b/TelepathyQt/readiness-helper.h index d570d17..fea4538 100644 --- a/TelepathyQt/readiness-helper.h +++ b/TelepathyQt/readiness-helper.h @@ -33,6 +33,7 @@ #include <QSet> #include <QSharedDataPointer> #include <QStringList> +#include <QObject> class QDBusError; -- cgit v0.10.2 ++++++ add-the-telepathy-qt-include.patch ++++++ >From 31c8f4170f58a21baebce226918e6ed52a46dd0b Mon Sep 17 00:00:00 2001 From: Aleix Pol <aleixpol(a)kde.org> Date: Thu, 30 Oct 2014 17:23:14 +0100 Subject: Add the telepathy-qt include directories to the telepathy-qt target Whoever wants to link against telepathy-qt will need to be able to include it, so do it right away. Reviewed by: David Edmundson diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 8e41f86..000c63b 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -773,6 +773,7 @@ target_link_libraries(telepathy-qt${QT_VERSION_MAJOR} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${TP_QT_LIBRARY_LINKER_FLAGS}) +target_include_directories(telepathy-qt${QT_VERSION_MAJOR} PUBLIC "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/>") # Link - Library used by tests to test some unexported functionality target_link_libraries(telepathy-qt-test-backdoors -- cgit v0.10.2

1 0

commit tor for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package tor for openSUSE:Factory checked in at 2015-03-30 19:33:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tor (Old) and /work/SRC/openSUSE:Factory/.tor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tor" Changes: -------- --- /work/SRC/openSUSE:Factory/tor/tor.changes 2015-03-23 12:17:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tor.new/tor.changes 2015-03-30 19:33:40.000000000 +0200 @@ -1,0 +2,25 @@ +Sun Mar 29 11:51:09 UTC 2015 - astieger(a)suse.com + +- tor 0.2.6.6, the first stable release in the 0.2.6 series: + * safety/security improvements + * correctness improvements + * performance improvements + * Client programs can be configured to use more kinds of sockets + * AutomapHosts works better + * multithreading backend is improved + * cell transmission is refactored + * test coverage is much higher + * more denial-of-service attacks are handled + * guard selection is improved to handle long-term guards better + * pluggable transports should work a bit better + * some annoying hidden service performance bugs addressed +- new minimal configuration file installed as active configuration + allows daemon to be run right after package installation +- build with systemd notifications where supported + +------------------------------------------------------------------- +Wed Mar 25 08:05:24 UTC 2015 - astieger(a)suse.com + +- add CVE IDs for 0.2.5.11 release + +------------------------------------------------------------------- @@ -8 +33 @@ - * relay crashes trough assertion + * relay crashes trough assertion (CVE-2015-2688) @@ -9,0 +35 @@ + (CVE-2015-2689) Old: ---- tor-0.2.5.11.tar.gz tor-0.2.5.11.tar.gz.asc New: ---- tor-0.2.6.6.tar.gz tor-0.2.6.6.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tor.spec ++++++ --- /var/tmp/diff_new_pack.KVAt7H/_old 2015-03-30 19:33:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KVAt7H/_new 2015-03-30 19:33:41.000000000 +0200 @@ -17,13 +17,14 @@ %define with_systemd 0%{?suse_version} > 1140 +%define with_systemd_notifications 0%{?suse_version} > 1310 %define with_upnp 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315 %define toruser %{name} %define torgroup %{name} %define home_dir %{_localstatedir}/lib/empty %bcond_with bufferevents Name: tor -Version: 0.2.5.11 +Version: 0.2.6.6 Release: 0 Summary: Anonymizing overlay network for TCP (The onion router) License: BSD-3-Clause @@ -55,10 +56,14 @@ %else BuildRequires: libevent-devel %endif -%if 0%{?with_systemd} +%if 0%{with_systemd} BuildRequires: pkgconfig(systemd) %{?systemd_requires} %endif +%if 0%{with_systemd_notifications} +BuildRequires: pkg-config >= 0.9.0 +BuildRequires: systemd-devel >= 209 +%endif # %description @@ -98,7 +103,12 @@ %if %{with bufferevents} --enable-bufferevents \ %endif +%if 0%{with_systemd_notifications} + --enable-systemd \ +%endif --enable-unittests \ + --enable-gcc-warnings \ + --enable-gcc-warnings-advisory \ --docdir=%{_docdir}/%{name} make %{?_smp_mflags} @@ -132,8 +142,9 @@ # control script install -p -m 755 contrib/dist/torctl %{buildroot}/%{_bindir} -# sample config file -install -p -m 644 src/config/torrc.sample %{buildroot}/%{_sysconfdir}/%{name}/torrc.sample +# sample config files +install -p -m 644 -D src/config/torrc.{sample,minimal} %{buildroot}/%{_sysconfdir}/%{name} +install -p -m 644 src/config/torrc.minimal %{buildroot}/%{_sysconfdir}/%{name}/torrc # logrotate conf sed -i -e "s|_tor|tor|g" contrib/operator-tools/tor.logrotate @@ -189,7 +200,8 @@ %{_datadir}/%{name}/geoip* %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(0755,root,%{torgroup}) %{_sysconfdir}/%{name} -%config(noreplace) %attr(0644,root,%{torgroup}) %{_sysconfdir}/%{name}/* +%config(noreplace) %attr(0644,root,%{torgroup}) %{_sysconfdir}/%{name}/torrc +%config %attr(0644,root,%{torgroup}) %{_sysconfdir}/%{name}/torrc.* %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %attr(0700,%{toruser},%{torgroup}) %dir %{_localstatedir}/lib/%{name} %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name} ++++++ tor-0.2.5.11.tar.gz -> tor-0.2.6.6.tar.gz ++++++ ++++ 85162 lines of diff (skipped)

1 0

commit u3-tool for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package u3-tool for openSUSE:Factory checked in at 2015-03-30 19:33:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u3-tool (Old) and /work/SRC/openSUSE:Factory/.u3-tool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "u3-tool" Changes: -------- --- /work/SRC/openSUSE:Factory/u3-tool/u3-tool.changes 2012-03-26 14:03:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u3-tool.new/u3-tool.changes 2015-03-30 19:33:36.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Mar 29 07:42:35 UTC 2015 - mpluskal(a)suse.com + +- Use url for source +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- Old: ---- u3-tool-0.3.tar.bz2 New: ---- u3-tool-0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u3-tool.spec ++++++ --- /var/tmp/diff_new_pack.lBlSyc/_old 2015-03-30 19:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.lBlSyc/_new 2015-03-30 19:33:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package u3-tool # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -24,10 +24,11 @@ License: GPL-2.0+ Group: Hardware/Other Url: http://u3-tool.sourceforge.net/ -Source: u3-tool-%{version}.tar.bz2 +Source0: http://sourceforge.net/projects/u3-tool/files/u3-tool/%{version}/u3-tool-%{… Patch0: u3-tool-0.3-fix-manpage-section.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf BuildRequires: automake +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: ppc ppc64 %description @@ -36,11 +37,6 @@ enabling, disabling, and resetting device security, and unlocking the secured data partition. - -Authors: --------- - <daviedev(a)users.sourceforge.net> - %prep %setup -q %patch0 -p1 @@ -51,10 +47,7 @@ make %{?_smp_mflags} %install -%makeinstall - -%clean -rm -rf %{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} %files %defattr(-,root,root,-)

1 0

commit global for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package global for openSUSE:Factory checked in at 2015-03-30 19:33:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/global (Old) and /work/SRC/openSUSE:Factory/.global.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "global" Changes: -------- --- /work/SRC/openSUSE:Factory/global/global.changes 2014-09-08 21:30:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.global.new/global.changes 2015-03-30 19:33:34.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Mar 28 11:12:51 UTC 2015 - mpluskal(a)suse.com + +- Use url for source +- Add gpg signature + +------------------------------------------------------------------- +Fri Mar 27 13:23:48 UTC 2015 - sleep_walker(a)suse.cz + +- update to 6.4 + see /usr/share/doc/packages/global/NEWS for complete list + of changes since 6.3.2 + +------------------------------------------------------------------- Old: ---- global-6.3.2.tar.gz New: ---- global-6.4.tar.gz global-6.4.tar.gz.sig global.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ global.spec ++++++ --- /var/tmp/diff_new_pack.MZnU7y/_old 2015-03-30 19:33:35.000000000 +0200 +++ /var/tmp/diff_new_pack.MZnU7y/_new 2015-03-30 19:33:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package global # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,13 +17,15 @@ Name: global -Version: 6.3.2 +Version: 6.4 Release: 0 Summary: Common source code tag system License: GPL-3.0 Group: Development/Tools/Navigators Url: http://www.gnu.org/software/global/ -Source: %{name}-%{version}.tar.gz +Source0: ftp://ftp.gnu.org/pub/gnu/global/%{name}-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/pub/gnu/global/%{name}-%{version}.tar.gz.sig +Source2: %{name}.keyring Patch0: global-5.7.diff Patch1: global-5.7-gcc.diff Patch3: global-5.9.5-fix-gcc-warnings.patch @@ -46,7 +48,7 @@ %build autoreconf -fi -%configure +%configure --disable-static make %install ++++++ global-5.7.diff ++++++ --- /var/tmp/diff_new_pack.MZnU7y/_old 2015-03-30 19:33:35.000000000 +0200 +++ /var/tmp/diff_new_pack.MZnU7y/_new 2015-03-30 19:33:35.000000000 +0200 @@ -2,10 +2,10 @@ Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: global-6.3.2/Makefile.am +Index: global-6.4/Makefile.am =================================================================== ---- global-6.3.2.orig/Makefile.am -+++ global-6.3.2/Makefile.am +--- global-6.4.orig/Makefile.am ++++ global-6.4/Makefile.am @@ -20,7 +20,7 @@ if USE_GTAGSCSCOPE SUBDIRS += gtags-cscope endif @@ -13,5 +13,5 @@ -gtagsdir = ${datadir}/gtags +gtagsdir = ${datadir}/doc/packages/global gtags_DATA = AUTHORS COPYING COPYING.LIB ChangeLog FAQ INSTALL LICENSE NEWS README THANKS \ - BOKIN_MODEL BOKIN_MODEL_FAQ DONORS BUILD_TOOLS \ + BOKIN_MODEL BOKIN_MODEL_FAQ DONORS BUILD_TOOLS README.PATCHES \ gtags.conf gtags.el gtags.pl gtags.vim gtags-cscope.vim \ ++++++ global-6.3.2.tar.gz -> global-6.4.tar.gz ++++++ ++++ 170817 lines of diff (skipped)

1 0