October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit datovka for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package datovka for openSUSE:Factory checked in at 2014-10-01 07:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/datovka (Old) and /work/SRC/openSUSE:Factory/.datovka.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "datovka" Changes: -------- --- /work/SRC/openSUSE:Factory/datovka/datovka.changes 2013-11-07 12:51:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.datovka.new/datovka.changes 2014-10-01 07:40:49.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 15 14:30:05 UTC 2014 - tchvatal(a)suse.com + +- Version bump to 3.1: + * Detect better file suffixes + * work with sqlalchemy 0.9 +- Cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- datovka-3.0.3.tar.gz New: ---- datovka-3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ datovka.spec ++++++ --- /var/tmp/diff_new_pack.Q3KvZ7/_old 2014-10-01 07:40:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Q3KvZ7/_new 2014-10-01 07:40:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package datovka # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,18 +16,23 @@ # +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch +%endif Name: datovka -Version: 3.0.3 +Version: 3.1 Release: 0 Summary: Library to access Czech eGov system \"Datove schranky\" License: LGPL-2.0+ Group: Development/Libraries/Python Url: http://labs.nic.cz/page/969/datovka/ -Source0: %{name}-%{version}.tar.gz +Source0: http://www.nic.cz/public_media/datove_schranky/releases/src/%{name}-%{versi… BuildRequires: dejavu BuildRequires: fdupes BuildRequires: python -BuildRequires: python-dslib >= 3.0 +BuildRequires: python-dslib >= 3.1 BuildRequires: python-gtk BuildRequires: python-openssl BuildRequires: python-reportlab @@ -35,19 +40,14 @@ BuildRequires: python-sqlalchemy BuildRequires: update-desktop-files Requires: dejavu -Requires: python-dslib >= 3.0 +Requires: python-dslib >= 3.1 Requires: python-gtk Requires: python-openssl Requires: python-reportlab Requires: python-setuptools Requires: python-sqlalchemy BuildRoot: %{_tmppath}/%{name}-%{version}-build -%py_requires -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else -BuildArch: noarch -%endif +%{py_requires} %description A library for accessing ISDS (Informační system datovych schranek/ @@ -67,30 +67,31 @@ python setup.py build %install -python setup.py install --prefix=%{_prefix} --optimize=2 --root="%{buildroot}" +python setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot} %fdupes %{buildroot} %find_lang %{name} -for file in %{buildroot}%{python_sitelib}/%name/{_update_license,datovka}.py ; do +for file in %{buildroot}%{python_sitelib}/%{name}/{_update_license,datovka}.py ; do chmod a+x $file done -chmod a-x %{buildroot}%_datadir/applications/%name.desktop -%suse_update_desktop_file %{buildroot}%_datadir/applications/%name.desktop +chmod a-x %{buildroot}%{_datadir}/applications/%{name}.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files lang -f %{name}.lang +%defattr(-,root,root) %files %defattr(-,root,root) %doc LICENSE README.txt -%dir %_datadir/%name +%dir %{_datadir}/%{name} %{python_sitelib}/* -%_bindir/%name -%_datadir/%name/* -%_datadir/applications/%name.desktop -%_datadir/icons/hicolor/* +%{_bindir}/%{name} +%{_datadir}/%{name}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/* %changelog ++++++ datovka-3.0.3.tar.gz -> datovka-3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/PKG-INFO new/datovka-3.1/PKG-INFO --- old/datovka-3.0.3/PKG-INFO 2013-01-04 12:58:31.000000000 +0100 +++ new/datovka-3.1/PKG-INFO 2014-07-11 15:42:06.000000000 +0200 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.0 Name: datovka -Version: 3.0.3 +Version: 3.1 Summary: Datovka (formerly dsgui) is a free graphical interface for 'Datove schranky' Home-page: http://labs.nic.cz/datove-schranky/ Author: CZ.NIC Labs @@ -10,8 +10,3 @@ Platform: Unix Platform: Windows Platform: MacOS X -Requires: gtk -Requires: pygtk -Requires: dslib (>=3.0) -Requires: SQLAlchemy (>=0.5) -Requires: dejavu_font diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/README.txt new/datovka-3.1/README.txt --- old/datovka-3.0.3/README.txt 2013-01-04 12:55:59.000000000 +0100 +++ new/datovka-3.1/README.txt 2014-06-18 22:44:58.000000000 +0200 @@ -24,6 +24,14 @@ Verze Datovky =============== +* verze 3.1 - + Update dslib - podpora nejnovější SQLAlchemy (0.9), přidané indexy do + databáze. + Pokud systém samotný správně nerozezná media type, tak u souborů .docx, + .xlsx, .pptx, .odt, .ods, .odp, .fo a .zfo jsou správně určeny. + Opravena chyba v zobrazování chybové hlášky pokud systém zprávu předává v + jiném kódování než utf-8. + * verze 3.0.3 - Bylo přidáno zapamatování pozice posuvníků mezi jednotlivými prvky grafického rozhraní. Opravena byla chyba zapamatování řadícího sloupce diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/_fill_fake_db.py new/datovka-3.1/_fill_fake_db.py --- old/datovka-3.0.3/_fill_fake_db.py 2012-12-11 10:08:47.000000000 +0100 +++ new/datovka-3.1/_fill_fake_db.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -import sqlite3 - -conn = sqlite3.connect("/home/beda/.dsgui/aaa___1.db") -cursor = conn.cursor() -cursor.execute("SELECT dmID FROM messages;") -msg_ids = [x[0] for x in cursor.fetchall()] -max_msg_id = max(msg_ids) - -print "Max message ID: %d" % max_msg_id - -table_cols = { -"messages": - ("dmID", - "is_verified", - "_origin", - "dbIDSender", - "dmSender", - "dmSenderAddress", - "dmSenderType", - "dmRecipient", - "dmRecipientAddress", - "dmAmbiguousRecipient", - "dmSenderOrgUnit", - "dmSenderOrgUnitNum", - "dbIDRecipient", - "dmRecipientOrgUnit", - "dmRecipientOrgUnitNum", - "dmToHands", - "dmAnnotation", - "dmRecipientRefNumber", - "dmSenderRefNumber", - "dmRecipientIdent", - "dmSenderIdent", - "dmLegalTitleLaw", - "dmLegalTitleYear", - "dmLegalTitleSect", - "dmLegalTitlePar", - "dmLegalTitlePoint", - "dmPersonalDelivery", - "dmAllowSubstDelivery", - "dmQTimestamp", - "dmDeliveryTime", - "dmAcceptanceTime", - "dmMessageStatus", - "dmAttachmentSize", - "_dmType",), -"hashes": - ("message_id", - "value", - "_algorithm",), -"files": - ("message_id", - "_dmFileDescr", - "_dmUpFileGuid", - "_dmFileGuid", - "_dmMimeType", - "_dmFormat", - "_dmFileMetaType", - "dmEncodedContent"), -"message_certificate_data": - ("message_id", - "certificate_id"), -"raw_message_data": - ("message_id", - "message_type", - "data"), -"raw_delivery_info_data": - ("message_id", - "data"), -"supplementary_message_data": - ("message_id", - "message_type", - "read_locally", - "download_date", - "custom_data"), -"events": - ("message_id", - "dmEventTime", - "dmEventDescr") -} - -tables = list(table_cols.keys()) -tables.remove("messages") -tables.insert(0, "messages") - -for msg_id in msg_ids: - max_msg_id += 1 - new_id = max_msg_id - print "Copying", msg_id - for table in tables: - print " -", table - if table == "messages": - id_col = "dmID" - else: - id_col = "message_id" - cols = table_cols[table] - all = ",".join(cols) - copied = ",".join(cols[1:]) - insert_command = """INSERT INTO {0} ({1}) - SELECT ?,{2} - FROM {0} WHERE {3}=?;""".format(table, all, copied, - id_col) - #print insert_command - cursor.execute(insert_command, (new_id, msg_id,)) -conn.commit() - - -cursor.close() -conn.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/datovka.egg-info/PKG-INFO new/datovka-3.1/datovka.egg-info/PKG-INFO --- old/datovka-3.0.3/datovka.egg-info/PKG-INFO 2013-01-04 12:58:31.000000000 +0100 +++ new/datovka-3.1/datovka.egg-info/PKG-INFO 2014-07-11 15:42:06.000000000 +0200 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.0 Name: datovka -Version: 3.0.3 +Version: 3.1 Summary: Datovka (formerly dsgui) is a free graphical interface for 'Datove schranky' Home-page: http://labs.nic.cz/datove-schranky/ Author: CZ.NIC Labs @@ -10,8 +10,3 @@ Platform: Unix Platform: Windows Platform: MacOS X -Requires: gtk -Requires: pygtk -Requires: dslib (>=3.0) -Requires: SQLAlchemy (>=0.5) -Requires: dejavu_font diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/datovka.egg-info/SOURCES.txt new/datovka-3.1/datovka.egg-info/SOURCES.txt --- old/datovka-3.0.3/datovka.egg-info/SOURCES.txt 2013-01-04 12:58:31.000000000 +0100 +++ new/datovka-3.1/datovka.egg-info/SOURCES.txt 2014-07-11 15:42:06.000000000 +0200 @@ -13,7 +13,6 @@ setup.py stdeb.cfg ./__init__.py -./_fill_fake_db.py ./_update_license.py ./account.py ./cert_display.py @@ -29,7 +28,6 @@ ./dumb_shelf.py ./error_handling.py ./export.py -./hack_ped.py ./icon_manager.py ./local.py ./message_dialog.py @@ -150,5 +148,4 @@ ui/ds_send.ui ui/message_dialog.ui ui/otp_dialog.ui -ui/proxy_dialog.ui -ui/tmp.ui \ No newline at end of file +ui/proxy_dialog.ui \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/datovka.egg-info/requires.txt new/datovka-3.1/datovka.egg-info/requires.txt --- old/datovka-3.0.3/datovka.egg-info/requires.txt 2013-01-04 12:58:31.000000000 +0100 +++ new/datovka-3.1/datovka.egg-info/requires.txt 2014-07-11 15:42:06.000000000 +0200 @@ -1,2 +1,2 @@ dslib >= 3.0 -SQLAlchemy >= 0.5 \ No newline at end of file +SQLAlchemy >= 0.8 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/datovka.py new/datovka-3.1/datovka.py --- old/datovka-3.0.3/datovka.py 2013-01-04 12:45:45.000000000 +0100 +++ new/datovka-3.1/datovka.py 2014-07-11 10:51:13.000000000 +0200 @@ -203,7 +203,7 @@ import ConfigParser import codecs try: - import gtk_osxapplication as QuartzApp + import gtkosx_application as QuartzApp except ImportError: QUARTZ_ENABLE = False else: @@ -357,7 +357,7 @@ self._last_otp_problem = None self.toplevel_message_store = None if QUARTZ_ENABLE: - self.macapp = QuartzApp.OSXApplication() + self.macapp = QuartzApp.Application() # here we save last directories for different functions self._last_dirs = {} # this is a event for synchronization of async stuff @@ -1018,6 +1018,8 @@ # available already if not self.account.account_info: self._sync_account_and_password_info() + if not self.account.account_info: # we weren't able to sync account, give it up + return # the send dialog itself dial = DsSendDialog(self, reply_to=reply_to) DsSendDialog._last_dir = self._get_topical_last_dir("ds_send") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/ds_send.py new/datovka-3.1/ds_send.py --- old/datovka-3.0.3/ds_send.py 2012-12-20 14:25:16.000000000 +0100 +++ new/datovka-3.1/ds_send.py 2014-06-18 22:45:00.000000000 +0200 @@ -152,7 +152,8 @@ d.destroy() if result == 1: for box in boxes: - self._add_recipient_row([box[0],box[1],box[2]+", "+box[3]]) + addr_join = ", ".join( filter(None, (box[2], box[3]))) + self._add_recipient_row([box[0],box[1],addr_join]) self._check_requisities() def on_add_recipient_from_contacts_activate(self, w): @@ -201,11 +202,23 @@ mimetype, encoding = mimetypes.guess_type(fullname) if mimetype == "application/xml": mimetype = "text/xml" + mime_list = { + '.fo': "application/vnd.software602.filler.form+xml", + '.zfo': "application/vnd.software602.filler.form-xml-zip", + '.odt': "application/vnd.oasis.opendocument.text", + '.ods': "application/vnd.oasis.opendocument.spreadsheet", + '.odp': "application/vnd.oasis.opendocument.presentation", + '.docx': "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + '.xlsx': "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + '.pptx': "application/vnd.openxmlformats-officedocument.presentationml.presentation", + } if not mimetype: - if name.endswith(".zfo"): - mimetype = "application/zip" + _name, ext = os.path.splitext(fullname) + if ext and ext in mime_list: + mimetype = mime_list[ext] else: - mimetype = "text/plain" + mimetype = "text/plain" # or maybe consider "application/octet-stream" + normname = os.path.normcase(fullname) for row in self.attachment_store: if row[1] == normname: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/error_handling.py new/datovka-3.1/error_handling.py --- old/datovka-3.0.3/error_handling.py 2012-12-18 14:49:32.000000000 +0100 +++ new/datovka-3.1/error_handling.py 2014-06-18 22:45:00.000000000 +0200 @@ -26,6 +26,7 @@ import sys import webbrowser import logging +import locale # external imports import gtk @@ -76,16 +77,23 @@ """ Creates a formated text that is """ - cp = os_support.get_default_text_encoding() + cp = (os_support.get_default_text_encoding() + or locale.getlocale()[1] + or locale.getdefaultlocale()[1] + or "ascii") detail = "" - if hasattr(self.inner_exception, "strerror"): - try: - desc = self.inner_exception.strerror.decode(cp) - except Exception, e: - # this should work, even though it might not look pretty - desc = unicode(self.inner_exception) - else: - desc = unicode(self.inner_exception) + + try: + if hasattr(self.inner_exception, "strerror"): + if isinstance(self.inner_exception.strerror, unicode): + desc = self.inner_exception.strerror + else: + desc = self.inner_exception.strerror.decode(cp) + else: + desc = unicode(self.inner_exception) + except Exception, e: + desc = u"unknown error" + return desc[:300] def get_help(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/hack_ped.py new/datovka-3.1/hack_ped.py --- old/datovka-3.0.3/hack_ped.py 2012-12-11 10:08:47.000000000 +0100 +++ new/datovka-3.1/hack_ped.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -import sys -sys.path.append("/home/beda/projects/isds/dsgui/dslib/") -import shelve -from datetime import datetime - -sh = shelve.open("/home/beda/.dsgui/messages.shelf") - -ped = datetime(2012,3,10) -print ped - -for key in ['wh5ef3___True','7io3jf___True']: - rec = sh[key] - print key, rec['password_expiration_date'] - rec['password_expiration_date'] = ped - print key, rec['password_expiration_date'] - sh[key] = rec - -sh.sync() -sh.close() Files old/datovka-3.0.3/locale/cs/LC_MESSAGES/datovka.mo and new/datovka-3.1/locale/cs/LC_MESSAGES/datovka.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/release.py new/datovka-3.1/release.py --- old/datovka-3.0.3/release.py 2013-01-04 12:47:31.000000000 +0100 +++ new/datovka-3.1/release.py 2014-06-18 22:44:58.000000000 +0200 @@ -16,4 +16,4 @@ #* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 #* USA -DSGUI_VERSION = "3.0.3" +DSGUI_VERSION = "3.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/setup.py new/datovka-3.1/setup.py --- old/datovka-3.0.3/setup.py 2012-12-18 14:49:32.000000000 +0100 +++ new/datovka-3.1/setup.py 2014-07-11 12:20:46.000000000 +0200 @@ -19,6 +19,11 @@ #* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# py2app code partly taken from partly inspired by setup.py +# from the Tryton project (www.tryton.org) +# Copyright (C) 2004-2014 Tryton team (hg.tryton.org/tryton/file/971f862eb459/COPYRIGHT) + + import sys import glob import os @@ -75,18 +80,204 @@ package_dir = {'datovka': './'}, data_files = data_files, scripts = ['datovka'], - requires=['gtk',"pygtk",'dslib (>=3.0)',"SQLAlchemy (>=0.5)", "dejavu_font"], - install_requires=['dslib >= 3.0',"SQLAlchemy >= 0.5"], + install_requires=['dslib >= 3.0',"SQLAlchemy >= 0.8"], zip_safe=False, ) if sys.platform == "darwin": - data.update( - options={'py2app': {'argv_emulation': False}}, - app=['datovka.py'], - setup_requires=['py2app'], - install_requires=["SQLAlchemy >= 0.5"], - ) + data.update( + options ={ 'py2app': { + 'argv_emulation': False, + 'iconfile': "icons/datovka.icns", + 'includes': "cairo, gio, atk, pango, pangocairo, " + "sqlalchemy.dialects.sqlite, gtk.keysyms", + 'packages': "reportlab, dslib", + 'plist': { + 'CFBundleIdentifier': "cz.nic.labs.datovka", + 'CFBundleName': "Datovka" + } + }}, + app=['datovka.py'], + setup_requires=['py2app'], + install_requires=["SQLAlchemy >= 0.8"], +) + +dist = setup(**data) + +if sys.platform == 'darwin' and 'py2app' in dist.commands: + def find_gtk_dir(): + for directory in os.environ['PATH'].split(':'): + if not os.path.isdir(directory): + continue + for file in ('gtk-demo',): + if os.path.isfile(os.path.join(directory, file)): + return os.path.dirname(directory) + return None + + import shutil + import re + from subprocess import Popen, PIPE + from itertools import chain + + gtk_dir = find_gtk_dir() + gtk_binary_version = Popen(['pkg-config', + '--variable=gtk_binary_version', 'gtk+-2.0'], + stdout=PIPE).stdout.read().strip() + + dist_dir = dist.command_obj['py2app'].dist_dir + resources_dir = os.path.join(dist_dir, 'Datovka.app', 'Contents', + 'Resources') + gtk_2_dist_dir = os.path.join(resources_dir, 'lib', 'gtk-2.0') + pango_dist_dir = os.path.join(resources_dir, 'lib', 'pango') + config_dir = os.path.join(resources_dir, 'etc') + os.mkdir(config_dir) + os.mkdir(os.path.join(config_dir, 'pango')) + os.mkdir(os.path.join(config_dir, 'gtk-2.0')) + gtkrc_file = os.path.join(config_dir, "gtk-2.0", "gtkrc") + + shutil.copytree(os.path.join(gtk_dir, 'lib', 'pango'), pango_dist_dir, + ignore=shutil.ignore_patterns('*.la', '*.a')) + + query_pango = Popen(os.path.join(gtk_dir, 'bin', 'pango-querymodules'), + stdout=PIPE).stdout.read() + query_pango = query_pango.replace(gtk_dir, + '@executable_path/../Resources') + pango_modules_path = os.path.join(config_dir, 'pango', 'pango.modules') + with open(pango_modules_path, 'w') as pango_modules: + pango_modules.write(query_pango) + + with open(os.path.join(config_dir, 'pango', 'pangorc'), 'w') as pangorc: + pangorc.write('[Pango]\n') + pangorc.write('ModuleFiles=etc/pango/pango.modules\n') + + query_loaders = Popen(os.path.join(gtk_dir, 'bin', + 'gdk-pixbuf-query-loaders'), stdout=PIPE).stdout.read() + loader_dir, = re.findall('# LoaderDir = (.*)', query_loaders) + loader_pkg = (loader_dir.replace(os.path.join(gtk_dir, 'lib'), + '').split(os.path.sep)[-3]) + loader_dist_dir = os.path.join(resources_dir, 'lib', loader_pkg, + gtk_binary_version, 'loaders') + if os.path.isdir(loader_dist_dir): + shutil.rmtree(loader_dist_dir) + if os.path.isdir(loader_dir): + shutil.copytree(loader_dir, loader_dist_dir, + ignore=shutil.ignore_patterns('*.la', '*.a')) + query_loaders = query_loaders.replace(os.path.join(gtk_dir, ''), + '') + + loaders_path = os.path.join(config_dir, 'gtk-2.0', 'gdk-pixbuf.loaders') + with open(loaders_path, 'w') as loaders: + loaders.write(query_loaders) + + if os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, + 'immodules')): + shutil.rmtree(os.path.join(gtk_2_dist_dir, gtk_binary_version, + 'immodules')) + shutil.copytree( + os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version, 'immodules'), + os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules'), + ignore=shutil.ignore_patterns('*.la', '*.a')) + + query_immodules = Popen(os.path.join(gtk_dir, 'bin', + 'gtk-query-immodules-2.0'), stdout=PIPE).stdout.read() + query_immodules = query_immodules.replace(gtk_dir, + '@executable_path/../Resources') + + immodules_path = os.path.join(config_dir, 'gtk-2.0', 'gtk.immodules') + with open(immodules_path, 'w') as immodules: + immodules.write(query_immodules) + + shutil.copytree( + os.path.join(gtk_dir, 'lib', 'gtk-2.0', 'modules'), + os.path.join(gtk_2_dist_dir, 'modules'), + ignore=shutil.ignore_patterns('*.la', '*.a')) + shutil.copytree( + os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version, 'engines'), + os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines'), + ignore=shutil.ignore_patterns('*.la', '*.a')) + + for lang in langs: + for mo_file in glob.glob(os.path.join(gtk_dir, 'share', 'locale', lang, + 'LC_MESSAGES', '*.mo')): + shutil.copy(mo_file, os.path.join(resources_dir, 'share', 'locale', + lang, 'LC_MESSAGES')) + + # share/mime/mime.cache is important, without it gdk-pixbuf is failing mysteriously + share_mime_dir = os.path.join(resources_dir, 'share', 'mime') + os.mkdir(share_mime_dir) + shutil.copy(os.path.join(gtk_dir, 'share', 'mime', 'mime.cache'), + share_mime_dir) + + # fix paths within shared libraries + print "\nfixing paths within shared libraries" + + for library in (os.path.join(root, fname) + for root, _dir, fnames in chain( + os.walk(gtk_2_dist_dir), + os.walk(pango_dist_dir), + os.walk(loader_dist_dir)) + for fname in fnames + if fname.endswith(".so")): + print library + libs = [lib.split('(')[0].strip() + for lib in Popen(['otool', '-L', library], + stdout=PIPE).communicate()[0].splitlines() + if 'compatibility' in lib] + libs = dict(((lib, None) for lib in libs if gtk_dir in lib)) + for lib in libs.keys(): + fixed = lib.replace(gtk_dir + '/lib', + '@executable_path/../Frameworks') + Popen(['install_name_tool', '-change', lib, fixed, + library]).wait() + + # create shell file which sets up all the necessary environmental variables + macos_dir = os.path.join(dist_dir, 'Datovka.app', 'Contents', 'MacOS') + launcher_file = os.path.join(macos_dir, 'Datovka') + os.rename(launcher_file, os.path.join(macos_dir, 'Datovka.bin')) + with open(launcher_file, 'w') as launcher_script: + launcher_script.write( +"""#!/bin/bash + +# find out where the contents of the bundle is + +PWD=`pwd` +DIRNAME=`dirname "$0"` +if [[ "$DIRNAME" = /* ]]; then + # absolute path + CONTENTS_DIR=$DIRNAME +else + if [[ "$DIRNAME" = "." ]]; then + CONTENTS_DIR=$PWD; + else + CONTENTS_DIR=$PWD/$DIRNAME + fi +fi + +CONTENTS_DIR=`dirname "$CONTENTS_DIR"` + +# setup some environment variables +export FONTCONFIG_FILE="$CONTENTS_DIR/Resources/etc/fonts/fonts.conf" +export GDK_PIXBUF_MODULE_FILE="$CONTENTS_DIR/Resources/etc/gtk-2.0/gdk-pixbuf.loaders" +export PANGO_RC_FILE="$CONTENTS_DIR/Resources/etc/pango/pangorc" +export GTK2_RC_FILES="$CONTENTS_DIR/Resources/etc/gtk-2.0/gtkrc" +export LOCALEDIR="$CONTENTS_DIR/Resources/share/locale" +export XDG_DATA_DIRS="$CONTENTS_DIR/Resources/share" +export DSGUI_DATA_DIR="$CONTENTS_DIR/Resources" + +# run the main executable +exec $CONTENTS_DIR/MacOS/Datovka.bin -set = setup(**data) +""" +) + os.chmod(launcher_file, 0755) + + with open(gtkrc_file, "w") as gtkrc_fh: + gtkrc_fh.write( +"""gtk-toolbar-style = GTK_TOOLBAR_ICONS +gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32" +gtk-toolbar-icon-size = large-toolbar +gtk-button-images = 0 +gtk-menu-images = 1 +""" +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/stdeb.cfg new/datovka-3.1/stdeb.cfg --- old/datovka-3.0.3/stdeb.cfg 2012-12-18 14:49:32.000000000 +0100 +++ new/datovka-3.1/stdeb.cfg 2014-06-18 22:44:58.000000000 +0200 @@ -3,7 +3,7 @@ Provides: dsgui, datovka Replaces: python-dsgui (<< 1.7-1~) Breaks: python-dsgui (<< 1.7-1~) -Depends: python-dslib (>=3.0), python-sqlalchemy, python-gtk2 +Depends: python-dslib (>=3.1), python-sqlalchemy (>=0.8), python-gtk2 Recommends: python-reportlab, ttf-dejavu XS-Python-Version: >= 2.6 MIME-Desktop-Files: datovka.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/datovka-3.0.3/ui/tmp.ui new/datovka-3.1/ui/tmp.ui --- old/datovka-3.0.3/ui/tmp.ui 2010-11-16 15:21:50.000000000 +0100 +++ new/datovka-3.1/ui/tmp.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <requires lib="gtk+" version="2.20"/> -  - <object class="GtkWindow" id="window1"> - <child> - <object class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="aa"> - <property name="visible">True</property> - <property name="label" translatable="yes">Search:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkViewport" id="viewport1"> - <property name="visible">True</property> - <property name="resize_mode">queue</property> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="message_search_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Search:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkViewport" id="viewport2"> - <property name="visible">True</property> - <property name="resize_mode">queue</property> - <child> - <object class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> -</interface> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-App-perlbrew for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package perl-App-perlbrew for openSUSE:Factory checked in at 2014-10-01 07:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-App-perlbrew (Old) and /work/SRC/openSUSE:Factory/.perl-App-perlbrew.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-App-perlbrew" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-App-perlbrew/perl-App-perlbrew.changes 2014-03-18 14:15:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-App-perlbrew.new/perl-App-perlbrew.changes 2014-10-01 07:40:47.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Sep 15 15:44:39 UTC 2014 - coolo(a)suse.com + +- updated to 0.71 + - Fix a few bugs of having unwanted values in PERL5LIB when switching between libs + + 0.70: # 2014-09-02T20:41:15+0900 + - download the fatpacked perlbrew from an http:// url. + - protect fatpacked perlbrew from PERL5LIB, thanks to dagolden++ + - avoid several warnings, thanks to DabeDotCom++ + - making perlbrew a bit friendlier to init.d script, thanks to maxhq++ . see also https://github.com/gugod/App-perlbrew/pull/404 + - make it possible to override PERLBREWURL before invoking installers + + 0.69: # 2014-06-10T23:32:05+0200 + - fix 'perlbrew env' breakage by just avoiding bad local::lib versions. + + 0.68: # 2014-06-07T15:08:00+0200 + - disable SSL cert checks. GH #385. + - "perlbrew download stable" works as on expects. GH #383 + - Many fish shell fixes. GH #376 #378 #379 + - make 5.21 installable. GH #396 + - various documentation fixes. + +------------------------------------------------------------------- Old: ---- App-perlbrew-0.67.tar.gz New: ---- App-perlbrew-0.71.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-App-perlbrew.spec ++++++ --- /var/tmp/diff_new_pack.gINexe/_old 2014-10-01 07:40:48.000000000 +0200 +++ /var/tmp/diff_new_pack.gINexe/_new 2014-10-01 07:40:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-App-perlbrew -Version: 0.67 +Version: 0.71 Release: 0 %define cpan_name App-perlbrew Summary: Manage perl installations in your $HOME @@ -29,21 +29,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(CPAN::Perl::Releases) >= 1.26 -BuildRequires: perl(Capture::Tiny) >= 0.22 -BuildRequires: perl(Devel::PatchPerl) >= 1.00 -BuildRequires: perl(IO::All) >= 0.46 -BuildRequires: perl(Path::Class) -BuildRequires: perl(Test::Exception) -BuildRequires: perl(Test::NoWarnings) -BuildRequires: perl(Test::Output) >= 0.04 -BuildRequires: perl(Test::Simple) >= 0.98 -BuildRequires: perl(Test::Spec) >= 0.46 -BuildRequires: perl(local::lib) >= 1.008026 -Requires: perl(CPAN::Perl::Releases) >= 1.26 -Requires: perl(Capture::Tiny) >= 0.22 -Requires: perl(Devel::PatchPerl) >= 1.00 -Requires: perl(local::lib) >= 1.008026 +BuildRequires: perl(CPAN::Perl::Releases) >= 1.84 +BuildRequires: perl(Capture::Tiny) >= 0.25 +BuildRequires: perl(Devel::PatchPerl) >= 1.24 +BuildRequires: perl(File::Temp) >= 0.2304 +BuildRequires: perl(IO::All) >= 0.51 +BuildRequires: perl(Path::Class) >= 0.33 +BuildRequires: perl(Pod::Parser) >= 1.62 +BuildRequires: perl(Pod::Usage) >= 1.64 +BuildRequires: perl(Test::Exception) >= 0.32 +BuildRequires: perl(Test::More) >= 1.001002 +BuildRequires: perl(Test::NoWarnings) >= 1.04 +BuildRequires: perl(Test::Output) >= 1.03 +BuildRequires: perl(Test::Simple) >= 1.001002 +BuildRequires: perl(Test::Spec) >= 0.47 +BuildRequires: perl(local::lib) >= 2.000014 +Requires: perl(CPAN::Perl::Releases) >= 1.84 +Requires: perl(Capture::Tiny) >= 0.25 +Requires: perl(Devel::PatchPerl) >= 1.24 +Requires: perl(Pod::Parser) >= 1.62 +Requires: perl(Pod::Usage) >= 1.64 +Requires: perl(local::lib) >= 2.000014 %{perl_requires} # MANUAL BuildRequires: groff @@ -51,11 +57,13 @@ %description perlbrew is a program to automate the building and installation of perl in -an easy way. It installs everything to '~/perl5/perlbrew', and requires you -to tweak your PATH by including a bashrc/cshrc file it provides. You then -can benefit from not having to run 'sudo' commands to install cpan modules -because those are installed inside your HOME too. It provides multiple -isolated perl environments, and a mechanism for you to switch between them. +an easy way. It provides multiple isolated perl environments, and a +mechanism for you to switch between them. + +Everything are installed unter '~/perl5/perlbrew'. You then need to include +a bashrc/cshrc provided by perlbrew to tweak the PATH for you. You then can +benefit from not having to run 'sudo' commands to install cpan modules +because those are installed inside your HOME too. For the documentation of perlbrew usage see the perlbrew manpage command on CPAN, or by running 'perlbrew help'. The following documentation features ++++++ App-perlbrew-0.67.tar.gz -> App-perlbrew-0.71.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/Changes new/App-perlbrew-0.71/Changes --- old/App-perlbrew-0.67/Changes 2013-11-20 08:50:10.000000000 +0100 +++ new/App-perlbrew-0.71/Changes 2014-09-13 20:01:52.000000000 +0200 @@ -1,3 +1,23 @@ +0.71: # 2014-09-13T19:59:15+0200 +- Fix a few bugs of having unwanted values in PERL5LIB when switching between libs + +0.70: # 2014-09-02T20:41:15+0900 +- download the fatpacked perlbrew from an http:// url. +- protect fatpacked perlbrew from PERL5LIB, thanks to dagolden++ +- avoid several warnings, thanks to DabeDotCom++ +- making perlbrew a bit friendlier to init.d script, thanks to maxhq++ . see also https://github.com/gugod/App-perlbrew/pull/404 +- make it possible to override PERLBREWURL before invoking installers + +0.69: # 2014-06-10T23:32:05+0200 +- fix 'perlbrew env' breakage by just avoiding bad local::lib versions. + +0.68: # 2014-06-07T15:08:00+0200 +- disable SSL cert checks. GH #385. +- "perlbrew download stable" works as on expects. GH #383 +- Many fish shell fixes. GH #376 #378 #379 +- make 5.21 installable. GH #396 +- various documentation fixes. + 0.67: # 2013-11-20T08:40:52+0100 - Support fish shell. Thanks to @yenzie++ - `info` command now takes an optional module name and show information for it. Thanks to @trcjr++ @@ -105,7 +125,7 @@ 0.46: - fix: The deprecation warning when running `self-upgrde` -- fix: system MANPATH detection +- fix: system MANPATH detection - improvement: Specifying multiple perl: `exec --with perl-5.14.2,perl-5.16.0` 0.45: @@ -208,7 +228,7 @@ - Hotfix for `perlbrew install` command 0.26: -- Fix GH #119 +- Fix GH #119 - Fix t/08.exit_status.t for cpantesters - Fix several bugs in `exec` command - Implement GH #103 - install -v shows build.log @@ -355,5 +375,3 @@ 0.01: - First release. Installs perl-5.11.[12345] on my mac. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/MANIFEST new/App-perlbrew-0.71/MANIFEST --- old/App-perlbrew-0.67/MANIFEST 2013-08-01 07:21:45.000000000 +0200 +++ new/App-perlbrew-0.71/MANIFEST 2014-09-02 13:42:20.000000000 +0200 @@ -56,6 +56,7 @@ t/do_system.t t/failure-command-install-cpanm.t t/failure-command-install-patchperl.t +t/http-program-control.t t/http.t t/installation-perlbrew.t t/installation.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/META.yml new/App-perlbrew-0.71/META.yml --- old/App-perlbrew-0.67/META.yml 2013-11-20 08:51:09.000000000 +0100 +++ new/App-perlbrew-0.71/META.yml 2014-09-13 20:09:58.000000000 +0200 @@ -4,20 +4,20 @@ - 'Kang-min Liu C<< <gugod(a)gugod.org> >>' build_requires: ExtUtils::MakeMaker: 6.59 - File::Temp: 0 - IO::All: 0.46 - Path::Class: 0 - Test::Exception: 0 - Test::More: 0 - Test::NoWarnings: 0 - Test::Output: 0.04 - Test::Simple: 0.98 - Test::Spec: 0.46 + File::Temp: '0.2304' + IO::All: '0.51' + Path::Class: '0.33' + Test::Exception: '0.32' + Test::More: '1.001002' + Test::NoWarnings: '1.04' + Test::Output: '1.03' + Test::Simple: '1.001002' + Test::Spec: '0.47' configure_requires: ExtUtils::MakeMaker: 6.59 distribution_type: module dynamic_config: 1 -generated_by: 'Module::Install version 1.06' +generated_by: 'Module::Install version 1.12' license: mit meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -29,12 +29,14 @@ - inc - t requires: - CPAN::Perl::Releases: 1.26 - Capture::Tiny: 0.22 - Devel::PatchPerl: 1.00 - local::lib: 1.008026 + CPAN::Perl::Releases: '1.84' + Capture::Tiny: '0.25' + Devel::PatchPerl: '1.24' + Pod::Parser: '1.62' + Pod::Usage: '1.64' + local::lib: '2.000014' perl: 5.8.0 resources: license: http://opensource.org/licenses/mit-license.php repository: git://github.com/gugod/App-perlbrew.git -version: 0.67 +version: '0.71' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/Makefile.PL new/App-perlbrew-0.71/Makefile.PL --- old/App-perlbrew-0.67/Makefile.PL 2013-11-20 08:49:39.000000000 +0100 +++ new/App-perlbrew-0.71/Makefile.PL 2014-09-13 20:01:41.000000000 +0200 @@ -7,24 +7,33 @@ repository 'git://github.com/gugod/App-perlbrew.git'; requires - 'Devel::PatchPerl' => '1.00', - 'local::lib' => '1.008026', - 'Capture::Tiny' => '0.22', - 'CPAN::Perl::Releases' => '1.26'; + 'CPAN::Perl::Releases' => '1.84', + 'Capture::Tiny' => '0.25', + 'Devel::PatchPerl' => '1.24', + 'Pod::Parser' => '1.62', + 'Pod::Usage' => '1.64', + 'local::lib' => '2.000014'; test_requires - 'Test::Simple' => '0.98', - 'Test::More' => '0', - 'Test::Output' => '0.04', # stdout_like added in 0.04 - 'Test::Exception' => '0', - 'Test::NoWarnings' => '0', - 'Test::Spec' => '0.46', # with() added in 0.46 - 'Path::Class' => '0', - 'IO::All' => '0.46', - 'File::Temp' => '0'; + 'ExtUtils::MakeMaker' => '6.86', + 'File::Temp' => '0.2304', + 'IO::All' => '0.51', + 'Path::Class' => '0.33', + 'Test::Exception' => '0.32', + 'Test::More' => '1.001002', + 'Test::NoWarnings' => '1.04', + 'Test::Output' => '1.03', + 'Test::Simple' => '1.001002', + 'Test::Spec' => '0.47'; install_script 'bin/perlbrew'; tests 't/*.t'; +makemaker_args( + dist => { + COMPRESS => "zopfli -i50", + } +); + WriteAll; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/README new/App-perlbrew-0.71/README --- old/App-perlbrew-0.67/README 2013-03-17 21:52:42.000000000 +0100 +++ new/App-perlbrew-0.71/README 2014-09-05 20:56:01.000000000 +0200 @@ -3,12 +3,13 @@ Description: perlbrew is a program to automate the building and installation of perl - in an easy way. It installs everything to "~/perl5/perlbrew", and - requires you to tweak your PATH by including a bashrc/cshrc file it - provides. You then can benefit from not having to run 'sudo' commands to - install cpan modules because those are installed inside your HOME too. - It provides multiple isolated perl environments, and a mechanism for you - to switch between them. + in an easy way. It provides multiple isolated perl environments, and a + mechanism for you to switch between them. + + Everything are installed unter "~/perl5/perlbrew". You then need to + include a bashrc/cshrc provided by perlbrew to tweak the PATH for you. + You then can benefit from not having to run 'sudo' commands to install + cpan modules because those are installed inside your HOME too. For the documentation of perlbrew usage see perlbrew command on CPAN, or by running "perlbrew help". The following documentation features the API @@ -30,11 +31,11 @@ to put it in your PATH. The installed perlbrew command is a standalone executable that can be - run with system perl. The minimun system perl version requirement is + run with system perl. The minimum system perl version requirement is 5.8.0, which should be good enough for most of the OSes these days. - A packed version of "patchperl" to "~/perl5/perlbrew/bin", which is - required to build old perls. + A fat-packed version of "patchperl" is also installed to + "~/perl5/perlbrew/bin", which is required to build old perls. The directory "~/perl5/perlbrew" will contain all install perl executables, libraries, documentations, lib, site_libs. In the @@ -46,6 +47,10 @@ export PERLBREW_ROOT=/opt/perl5 curl -kL http://install.perlbrew.pl | bash + As a result, different users on the same machine can all share the same + perlbrew root directory (although only original user that made the + installation would have the permission to perform perl installations.) + You may also install perlbrew from CPAN: cpan App::perlbrew @@ -76,7 +81,7 @@ set this environment variable in your "bashrc" to the directory in your shell RC before sourcing perlbrew's RC. - It is possible to share one perlbrew root with multilpe user account + It is possible to share one perlbrew root with multiple user account on the same machine. Therefore people do not have to install the same version of perl over an over. Let's say "/opt/perl5" is the directory we want to share. All users should be able append this @@ -85,7 +90,7 @@ export PERLBREW_ROOT=/opt/perl5 source ${PERLBREW_ROOT}/etc/bashrc - After doing so, everone's PATH should include "/opt/perl5/bin" and + After doing so, everyone's PATH should include "/opt/perl5/bin" and "/opt/perl5/perls/${PERLBREW_PERL}/bin". Each user can invoke "perlbrew switch" and "perlbrew use" to independently switch to different perl environment of their choice. However, only the user @@ -123,7 +128,7 @@ setting per-machine. To do so, you can use the "PERLBREW_HOME" environment variable to tell perlbrew where to look for the initialization file. Here's a brief bash snippet for the given - senario. + scenario. if [ "$(hostname)" == "machine-a" ]; then export PERLBREW_HOME=~/.perlbrew-a @@ -133,6 +138,13 @@ source ~/perl5/perlbrew/etc/bashrc + PERLBREW_CONFIGURE_FLAGS + This environment variable specify the list of command like flags to + pass through to 'sh Configure'. By default it is '-de'. + + PERLBREW_CPAN_MIRROR + The CPAN mirror url of your choice. + Project Development: perlbrew project uses github <http://github.com/gugod/App-perlbrew/issues> and RT @@ -147,7 +159,7 @@ Kang-min Liu "<gugod(a)gugod.org>" Copyright: - Copyright (c) 2010, 2011, 2012 Kang-min Liu "<gugod(a)gugod.org>". + Copyright (c) 2010,2011,2012,2013,2014 Kang-min Liu "<gugod(a)gugod.org>". Disclaimer of Warranty: BECAUSE THIS SOFTWARE IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/bin/perlbrew new/App-perlbrew-0.71/bin/perlbrew --- old/App-perlbrew-0.67/bin/perlbrew 2013-11-20 08:49:39.000000000 +0100 +++ new/App-perlbrew-0.71/bin/perlbrew 2014-09-05 20:56:01.000000000 +0200 @@ -20,7 +20,7 @@ Commands: init Initialize perlbrew environment. - info Show usefull information about the perlbrew installation + info Show useful information about the perlbrew installation install Install perl uninstall Uninstall the given installation @@ -150,10 +150,12 @@ Usage: perlbrew info [ <module> ] -Display usefull information about the perlbrew installation. +Display useful information about the perlbrew installation. If a module is given the version and location of the module is displayed. +=back + =head1 COMMAND: INSTALL =over 4 @@ -313,7 +315,12 @@ Usage: perlbrew list -List the installed versions of perl. +List all perl installations inside perlbrew root specifed by C<$PERLBREW_ROOT> +environment variable. By default, the value is C<~/perl5/perlbrew>. + +If there are libs associated to some perl installations, they will be included +as part of the name. The output items in this list can be the argument in +various other commands. =head1 COMMAND: AVAILABLE @@ -433,7 +440,7 @@ export PERLBREW_PATH=/Users/gugod/perl5/perlbrew/bin:/Users/gugod/perl5/perlbrew/perls/current/bin export PERLBREW_PERL=perl-5.14.1 -tcsh / csh users should use 'setenv' statements instead of `export`. +tcsh / csh users should see 'setenv' statements instead of `export`. =head1 COMMAND: SYMLINK-EXECUTABLES @@ -495,9 +502,9 @@ NOTICE: You should not need to run this command in your daily routine. -This command install perlbrew itself to C<$PERLBREW_ROOT/bin>. It is intended -used by the perlbrew installer. However, you may manually do the following to -re-install only the C<perlbrew> executable: +This command install perlbrew itself to C<$PERLBREW_ROOT/bin>. It is intended to +be used by the perlbrew installer. However, you could manually do the following +to re-install only the C<perlbrew> executable: curl -kL http://get.perlbrew.pl -o perlbrew perl ./perlbrew self-install @@ -509,7 +516,7 @@ Usage: perlbrew clean -Removes downloaded Perl tarballs and build directories. +Removes all previously downloaded Perl tarballs and build directories. =head1 COMMAND: VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Base.pm new/App-perlbrew-0.71/inc/Module/Install/Base.pm --- old/App-perlbrew-0.67/inc/Module/Install/Base.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Base.pm 2014-09-13 20:09:58.000000000 +0200 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; } # Suspend handler for "redefined" warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Can.pm new/App-perlbrew-0.71/inc/Module/Install/Can.pm --- old/App-perlbrew-0.67/inc/Module/Install/Can.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Can.pm 2014-09-13 20:09:58.000000000 +0200 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Fetch.pm new/App-perlbrew-0.71/inc/Module/Install/Fetch.pm --- old/App-perlbrew-0.67/inc/Module/Install/Fetch.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Fetch.pm 2014-09-13 20:09:58.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Makefile.pm new/App-perlbrew-0.71/inc/Module/Install/Makefile.pm --- old/App-perlbrew-0.67/inc/Module/Install/Makefile.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Makefile.pm 2014-09-13 20:09:58.000000000 +0200 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -133,7 +133,7 @@ return $args; } -# For mm args that take multiple space-seperated args, +# For mm args that take multiple space-separated args, # append an argument to the current list. sub makemaker_append { my $self = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Metadata.pm new/App-perlbrew-0.71/inc/Module/Install/Metadata.pm --- old/App-perlbrew-0.67/inc/Module/Install/Metadata.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Metadata.pm 2014-09-13 20:09:58.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -347,7 +347,7 @@ ^ \s* package \s* ([\w:]+) - \s* ; + [\s|;]* /ixms ) { my ($name, $module_name) = ($1, $1); @@ -705,7 +705,7 @@ my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); my $meta = $yaml[0]; - # Overwrite the non-configure dependency hashs + # Overwrite the non-configure dependency hashes delete $meta->{requires}; delete $meta->{build_requires}; delete $meta->{recommends}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Scripts.pm new/App-perlbrew-0.71/inc/Module/Install/Scripts.pm --- old/App-perlbrew-0.67/inc/Module/Install/Scripts.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Scripts.pm 2014-09-13 20:09:58.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/Win32.pm new/App-perlbrew-0.71/inc/Module/Install/Win32.pm --- old/App-perlbrew-0.67/inc/Module/Install/Win32.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/Win32.pm 2014-09-13 20:09:58.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install/WriteAll.pm new/App-perlbrew-0.71/inc/Module/Install/WriteAll.pm --- old/App-perlbrew-0.67/inc/Module/Install/WriteAll.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install/WriteAll.pm 2014-09-13 20:09:58.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.12'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/inc/Module/Install.pm new/App-perlbrew-0.71/inc/Module/Install.pm --- old/App-perlbrew-0.67/inc/Module/Install.pm 2013-11-20 08:51:08.000000000 +0100 +++ new/App-perlbrew-0.71/inc/Module/Install.pm 2014-09-13 20:09:58.000000000 +0200 @@ -17,7 +17,7 @@ # 3. The ./inc/ version of Module::Install loads # } -use 5.005; +use 5.006; use strict 'vars'; use Cwd (); use File::Find (); @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.06'; + $VERSION = '1.12'; # Storage for the pseudo-singleton $MAIN = undef; @@ -156,10 +156,10 @@ sub autoload { my $self = shift; my $who = $self->_caller; - my $cwd = Cwd::cwd(); + my $cwd = Cwd::getcwd(); my $sym = "${who}::AUTOLOAD"; $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); + my $pwd = Cwd::getcwd(); if ( my $code = $sym->{$pwd} ) { # Delegate back to parent dirs goto &$code unless $cwd eq $pwd; @@ -239,7 +239,7 @@ # ignore the prefix on extension modules built from top level. my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { + unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) { delete $args{prefix}; } return $args{_self} if $args{_self}; @@ -338,7 +338,7 @@ if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { my $content = Module::Install::_read($subpath . '.pm'); my $in_pod = 0; - foreach ( split //, $content ) { + foreach ( split /\n/, $content ) { $in_pod = 1 if /^=\w/; $in_pod = 0 if /^=cut/; next if ($in_pod || /^=cut/); # skip pod text @@ -434,7 +434,7 @@ # _version is for processing module versions (eg, 1.03_05) not # Perl versions (eg, 5.8.1). -sub _version ($) { +sub _version { my $s = shift || 0; my $d =()= $s =~ /(\.)/g; if ( $d >= 2 ) { @@ -450,12 +450,12 @@ return $l + 0; } -sub _cmp ($$) { +sub _cmp { _version($_[1]) <=> _version($_[2]); } # Cloned from Params::Util::_CLASS -sub _CLASS ($) { +sub _CLASS { ( defined $_[0] and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/lib/App/perlbrew.pm new/App-perlbrew-0.71/lib/App/perlbrew.pm --- old/App-perlbrew-0.67/lib/App/perlbrew.pm 2013-11-20 08:50:10.000000000 +0100 +++ new/App-perlbrew-0.71/lib/App/perlbrew.pm 2014-09-13 20:01:52.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use warnings; use 5.008; -our $VERSION = "0.67"; +our $VERSION = "0.71"; use Config; BEGIN { @@ -22,8 +22,17 @@ use List::Util qw/min/; use Getopt::Long (); +sub uniq { + my %seen; grep { !$seen{$_}++ } @_; +} + ### global variables +# set $ENV{SHELL} to executable path of parent process (= shell) if it's missing +# (e.g. if this script was executed by a daemon started with "service xxx start") +# ref: https://github.com/gugod/App-perlbrew/pull/404 +$ENV{SHELL} ||= readlink joinpath("/proc", getppid, "exe") if -d "/proc"; + local $SIG{__DIE__} = sub { my $message = shift; warn $message; @@ -111,36 +120,47 @@ my %commands = ( curl => { test => '--version >/dev/null 2>&1', - get => '--silent --location --fail -o - {url}', - download => '--silent --location --fail -o {output} {url}' + get => '--insecure --silent --location --fail -o - {url}', + download => '--insecure --silent --location --fail -o {output} {url}', + order => 1, }, wget => { test => '--version >/dev/null 2>&1', - get => '--quiet -O - {url}', - download => '--quiet -O {output} {url}', + get => '--no-check-certificate --quiet -O - {url}', + download => '--no-check-certificate --quiet -O {output} {url}', + order => 2, }, fetch => { test => '--version >/dev/null 2>&1', - get => '-o - {url}', - download => '{url}' + get => '--no-verify-peer -o - {url}', + download => '--no-verify-peer {url}', + order => 3, } ); + our $HTTP_USER_AGENT_PROGRAM; sub http_user_agent_program { - my $program; - for my $p (keys %commands) { - my $code = system("$p $commands{$p}->{test}") >> 8; - if ($code != 127) { - $program = $p; - last; + $HTTP_USER_AGENT_PROGRAM ||= do { + my $program; + + for my $p (sort {$commands{$a}{order}<=>$commands{$b}{order}} keys %commands) { + my $code = system("$p $commands{$p}->{test}") >> 8; + if ($code != 127) { + $program = $p; + last; + } } - } - unless($program) { - die "[ERROR] Cannot find a proper http user agent program. Please install curl or wget.\n"; - } + unless($program) { + die "[ERROR] Cannot find a proper http user agent program. Please install curl or wget.\n"; + } + + $program; + }; + + die "[ERROR] Unrecognized http user agent program: $HTTP_USER_AGENT_PROGRAM. It can only be one of: ".join(",", keys %commands)."\n" unless $commands{$HTTP_USER_AGENT_PROGRAM}; - return $program; + return $HTTP_USER_AGENT_PROGRAM; } sub http_user_agent_command { @@ -300,7 +320,7 @@ 'quiet|q!', 'verbose|v', 'as=s', - 'append=s', + 'append=s', 'help|h', 'version', 'root=s', @@ -982,7 +1002,7 @@ my $dist_tarball_path = joinpath($self->root, "dists", $dist_tarball); if (-f $dist_tarball_path) { - print "Use the previously fetched ${dist_tarball}\n" + print "Using the previously fetched ${dist_tarball}\n" if $self->{verbose}; } else { @@ -1150,6 +1170,9 @@ sub run_command_download { my ($self, $dist) = @_; + $dist = $self->resolve_stable_version + if $dist && $dist eq 'stable'; + my ($dist_version) = $dist =~ /^ (?:perl-?)? (.*) $/xs; die "\"$dist\" does not look like a perl distribution name. " unless $dist_version =~ /^\d\./; @@ -1279,7 +1302,7 @@ } unshift @d_options, qq(prefix=$perlpath); - push @d_options, "usedevel" if $dist_version =~ /5\.1[13579]|git|blead/; + push @d_options, "usedevel" if $dist_version =~ /5\.\d[13579]|git|blead/; unless (grep { /eval:scriptdir=/} @a_options) { push @a_options, "'eval:scriptdir=${perlpath}/bin'"; @@ -1467,7 +1490,21 @@ for (<$root/perls/*>) { my ($name) = $_ =~ m/\/([^\/]+$)/; my $executable = joinpath($_, 'bin', 'perl'); - my $orig_version = `$executable -e 'print \$]'`; + my $version_file = joinpath($_,'.version'); + my $orig_version; + if ( -e $version_file ){ + open my $fh, '<', $version_file; + local $/; + $orig_version = <$fh>; + chomp $orig_version; + } else { + $orig_version = `$executable -e 'print \$]'`; + if ( defined $orig_version and length $orig_version ){ + if (open my $fh, '>', $version_file ){ + print {$fh} $orig_version; + } + } + } push @result, { name => $name, @@ -1538,6 +1575,14 @@ PERLBREW_ROOT => $self->root ); + require local::lib; + my $current_local_lib_root = $self->env("PERL_LOCAL_LIB_ROOT") || ""; + my $current_local_lib_context = local::lib->new; + my @perlbrew_local_lib_root = uniq(grep { /\Q${PERLBREW_HOME}\E/ } split(/:/, $current_local_lib_root)); + if ($current_local_lib_root =~ /^\Q$PERLBREW_HOME\E/) { + $current_local_lib_context = $current_local_lib_context->activate($_) for @perlbrew_local_lib_root; + } + if ($perl_name) { if(-d "@{[ $self->root ]}/perls/$perl_name/bin") { $env{PERLBREW_PERL} = $perl_name; @@ -1546,63 +1591,35 @@ } if ($lib_name) { - require local::lib; - - if ($ENV{PERL_LOCAL_LIB_ROOT} - && $ENV{PERL_LOCAL_LIB_ROOT} =~ /^\Q$PERLBREW_HOME\E/ - ) { - my %deactivate_env = local::lib->build_deact_all_environment_vars_for($ENV{PERL_LOCAL_LIB_ROOT}); - @env{keys %deactivate_env} = values %deactivate_env; - } + $current_local_lib_context = $current_local_lib_context->deactivate($_) for @perlbrew_local_lib_root; my $base = "$PERLBREW_HOME/libs/${perl_name}\@${lib_name}"; if (-d $base) { - delete $ENV{PERL_LOCAL_LIB_ROOT}; - @ENV{keys %env} = values %env; - while (my ($k,$v) = each %ENV) { - delete $ENV{$k} unless defined($v); - } - my %lib_env = local::lib->build_environment_vars_for($base, 0, 1); + $current_local_lib_context = $current_local_lib_context->activate($base); $env{PERLBREW_PATH} = joinpath($base, "bin") . ":" . $env{PERLBREW_PATH}; $env{PERLBREW_MANPATH} = joinpath($base, "man") . ":" . $env{PERLBREW_MANPATH}; $env{PERLBREW_LIB} = $lib_name; - - $env{PERL_MM_OPT} = $lib_env{PERL_MM_OPT}; - $env{PERL_MB_OPT} = $lib_env{PERL_MB_OPT}; - $env{PERL5LIB} = $lib_env{PERL5LIB}; - $env{PERL_LOCAL_LIB_ROOT} = $lib_env{PERL_LOCAL_LIB_ROOT}; - } - } - else { - my $libroot = $self->env("PERL_LOCAL_LIB_ROOT"); - if ($libroot && $libroot =~ /^\Q$PERLBREW_HOME\E/) { - require local::lib; - my %deactivate_env = local::lib->build_deact_all_environment_vars_for($libroot); - @env{keys %deactivate_env} = values %deactivate_env; - $env{PERLBREW_LIB} = undef; - } - if (my $perl5lib = $self->env("PERL5LIB")) { - my @perl5libs = split $Config{path_sep} => $perl5lib; - my @pristine_perl5libs = grep { !/^\Q$PERLBREW_HOME\E/ } @perl5libs; - if (@pristine_perl5libs) { - $env{PERL5LIB} = join $Config{path_sep}, @pristine_perl5libs; - } - else { - $env{PERL5LIB} = undef; - } } + } else { + $current_local_lib_context = $current_local_lib_context->deactivate($_) for @perlbrew_local_lib_root; + $env{PERLBREW_LIB} = undef; } - } - else { - my $libroot = $self->env("PERL_LOCAL_LIB_ROOT"); - if ($libroot && $libroot =~ /^\Q$PERLBREW_HOME\E/) { - require local::lib; - my %deactivate_env = local::lib->build_deact_all_environment_vars_for($libroot); - @env{keys %deactivate_env} = values %deactivate_env; - $env{PERLBREW_LIB} = undef; + + my %ll_env = $current_local_lib_context->build_environment_vars; + delete $ll_env{PATH}; + for my $key (keys %ll_env) { + $env{$key} = $ll_env{$key}; } + } else { + $current_local_lib_context = $current_local_lib_context->deactivate($_) for @perlbrew_local_lib_root; + my %ll_env = $current_local_lib_context->build_environment_vars; + delete $ll_env{PATH}; + for my $key (keys %ll_env) { + $env{$key} = $ll_env{$key}; + } + $env{PERLBREW_LIB} = undef; $env{PERLBREW_PERL} = undef; } @@ -1826,11 +1843,15 @@ for my $k (sort keys %env) { my $v = $env{$k}; if (defined $v) { - $v =~ s/(\\")/\\$1/g; - print "export $k=\"$v\"\n"; + if ($v || ($v && exists($ENV{$k}))) { + $v =~ s/(\\")/\\$1/g; + print "export $k=\"$v\"\n"; + } } else { - print "unset $k\n"; + if (exists $ENV{$k}) { + print "unset $k\n"; + } } } } @@ -1838,11 +1859,15 @@ for my $k (sort keys %env) { my $v = $env{$k}; if (defined $v) { - $v =~ s/(\\")/\\$1/g; - print "setenv $k \"$v\"\n"; + if ($v || ($v && exists($ENV{$k}))) { + $v =~ s/(\\")/\\$1/g; + print "setenv $k \"$v\"\n"; + } } else { - print "unsetenv $k\n"; + if (exists $ENV{$k}) { + print "unsetenv $k\n"; + } } } } @@ -1867,7 +1892,7 @@ sub run_command_install_patchperl { my ($self) = @_; $self->do_install_program_from_url( - 'https://raw.github.com/gugod/patchperl-packing/master/patchperl', + 'https://raw.githubusercontent.com/gugod/patchperl-packing/master/patchperl', 'patchperl', sub { my ($body) = @_; @@ -1879,7 +1904,7 @@ sub run_command_install_cpanm { my ($self) = @_; - $self->do_install_program_from_url('https://raw.github.com/miyagawa/cpanminus/master/cpanm' => 'cpanm'); + $self->do_install_program_from_url('https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm' => 'cpanm'); } sub run_command_self_upgrade { @@ -2548,9 +2573,9 @@ sub PERLBREW_FISH_CONTENT { return "set -x PERLBREW_FISH_VERSION $VERSION\n" . <<'END'; -function __perlbrew_reinit; +function __perlbrew_reinit if not test -d "$PERLBREW_HOME" - mkdir-p "$PERLBREW_HOME" + mkdir -p "$PERLBREW_HOME" end echo '# DO NOT EDIT THIS FILE' > "$PERLBREW_HOME/init" @@ -2559,10 +2584,10 @@ __perlbrew_set_path end -function __perlbrew_set_path; +function __perlbrew_set_path set -l MANPATH_WITHOUT_PERLBREW (perl -e 'print join " ", grep { index($_, $ENV{PERLBREW_HOME}) < 0 } grep { index($_, $ENV{PERLBREW_ROOT}) < 0 } split/:/,qx(manpath 2> /dev/null);') - if test -n "$PERLBREW_MANPATH" + if test -n "$PERLBREW_MANPATH" set -x MANPATH $PERLBREW_MANPATH $MANPATH_WITHOUT_PERLBREW else set -x MANPATH $MANPATH_WITHOUT_PERLBREW @@ -2578,7 +2603,7 @@ end end -function __perlbrew_set_env; +function __perlbrew_set_env set -l code (eval $perlbrew_command env $argv | perl -pe 's/export\s+(\S+)="(\S*)"/set -x $1 $2;/g; y/:/ /') if test -z "$code" @@ -2586,10 +2611,9 @@ else eval $code end - end -function __perlbrew_activate; +function __perlbrew_activate functions -e perl if test -n "$PERLBREW_PERL" @@ -2605,17 +2629,23 @@ function __perlbrew_deactivate __perlbrew_set_env - set -r PERLBREW_PERL - set -r PERLBREW_LIB + set -x PERLBREW_PERL + set -x PERLBREW_LIB + set -x PERLBREW_PATH __perlbrew_set_path end -function perlbrew; +function perlbrew + + test -z "$argv" + and echo " Usage: perlbrew <command> [options] [arguments]" + and echo " or: perlbrew help" + and return 1 switch $argv[1] case use - if test ( count $argv ) -eq 1 - if test -x "$PERLBREW_PERL" + if test ( count $argv ) -eq 1 + if test -z "$PERLBREW_PERL" echo "Currently using system perl" else echo "Currently using $PERLBREW_PERL" @@ -2648,20 +2678,18 @@ case '*' command perlbrew $argv - - end end function __source_init - eval (perl -pe's/^export/set -x/; s/=/ /; s/$/;/;' "$PERLBREW_HOME/init") + perl -pe's/^export/set -x/; s/=/ /; s/$/;/;' "$PERLBREW_HOME/init" | . - end if test -z "$PERLBREW_ROOT" set -x PERLBREW_ROOT "$HOME/perl5/perlbrew" end -if test -x "$PERLBREW_HOME" +if test -z "$PERLBREW_HOME" set -x PERLBREW_HOME "$HOME/.perlbrew" end @@ -2700,8 +2728,8 @@ end end -for com in (perlbrew help | perl -ne'print lc if s/^COMMAND:\s+//') - complete -f -c perlbrew -n '__fish_perlbrew_needs_command' -a $com +for com in (perlbrew help | perl -ne'print lc if s/^COMMAND:\s+//') + complete -f -c perlbrew -n '__fish_perlbrew_needs_command' -a $com end for com in switch use; @@ -2893,16 +2921,15 @@ perlbrew available # Install some Perls - perlbrew install 5.14.0 + perlbrew install 5.18.2 perlbrew install perl-5.8.1 - perlbrew install perl-5.13.6 + perlbrew install perl-5.19.9 # See what were installed perlbrew list - # Switch perl in the $PATH - perlbrew switch perl-5.12.2 - perl -v + # Swith to an installation and set it as default + perlbrew switch perl-5.18.2 # Temporarily use another version only in current shell. perlbrew use perl-5.8.1 @@ -2921,11 +2948,13 @@ =head1 DESCRIPTION perlbrew is a program to automate the building and installation of perl in an -easy way. It installs everything to C<~/perl5/perlbrew>, and requires you to -tweak your PATH by including a bashrc/cshrc file it provides. You then can -benefit from not having to run 'sudo' commands to install cpan modules because -those are installed inside your HOME too. It provides multiple isolated perl -environments, and a mechanism for you to switch between them. +easy way. It provides multiple isolated perl environments, and a mechanism +for you to switch between them. + +Everything are installed unter C<~/perl5/perlbrew>. You then need to include a +bashrc/cshrc provided by perlbrew to tweak the PATH for you. You then can +benefit from not having to run 'sudo' commands to install +cpan modules because those are installed inside your HOME too. For the documentation of perlbrew usage see L<perlbrew> command on CPAN, or by running C<perlbrew help>. The following documentation @@ -2951,8 +2980,8 @@ system perl. The minimum system perl version requirement is 5.8.0, which should be good enough for most of the OSes these days. -A packed version of C<patchperl> to C<~/perl5/perlbrew/bin>, which is required -to build old perls. +A fat-packed version of C<patchperl> is also installed to +C<~/perl5/perlbrew/bin>, which is required to build old perls. The directory C<~/perl5/perlbrew> will contain all install perl executables, libraries, documentations, lib, site_libs. In the documentation, that directory @@ -2963,6 +2992,10 @@ export PERLBREW_ROOT=/opt/perl5 curl -kL http://install.perlbrew.pl | bash +As a result, different users on the same machine can all share the same perlbrew +root directory (although only original user that made the installation would +have the permission to perform perl installations.) + You may also install perlbrew from CPAN: cpan App::perlbrew @@ -3018,7 +3051,7 @@ =head1 COPYRIGHT -Copyright (c) 2010, 2011, 2012 Kang-min Liu C<< <gugod(a)gugod.org> >>. +Copyright (c) 2010,2011,2012,2013,2014 Kang-min Liu C<< <gugod(a)gugod.org> >>. =head1 LICENCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.67/t/http-program-control.t new/App-perlbrew-0.71/t/http-program-control.t --- old/App-perlbrew-0.67/t/http-program-control.t 1970-01-01 01:00:00.000000000 +0100 +++ new/App-perlbrew-0.71/t/http-program-control.t 2014-09-05 20:56:01.000000000 +0200 @@ -0,0 +1,23 @@ +#!/usr/bin/env perl +use strict; +use warnings; + +use FindBin; +use lib $FindBin::Bin; +use App::perlbrew; +require 'test_helpers.pl'; + +use Test::More; +use Test::Exception; + +for (qw(curl wget fetch)) { + $App::perlbrew::HTTP_USER_AGENT_PROGRAM = "curl"; + is App::perlbrew::http_user_agent_program(), "curl"; +} + +$App::perlbrew::HTTP_USER_AGENT_PROGRAM = "something-that-is-not-recognized"; +dies_ok { + App::perlbrew::http_user_agent_program(); +} "should die when asked to use unrecognized http UA program"; + +done_testing; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-source_validator for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package obs-service-source_validator for openSUSE:Factory checked in at 2014-10-01 07:40:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old) and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-source_validator" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes 2014-08-16 15:37:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes 2014-10-01 07:40:42.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 29 10:23:20 UTC 2014 - coolo(a)suse.com + +- update from git: + - allow all files mentioned in .dsc too + - import old md5 based keys like for postfix and putty + +------------------------------------------------------------------- Old: ---- obs-service-source_validator-0.4.tar.bz2 New: ---- obs-service-source_validator-0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.R2brGf/_old 2014-10-01 07:40:43.000000000 +0200 +++ /var/tmp/diff_new_pack.R2brGf/_new 2014-10-01 07:40:43.000000000 +0200 @@ -20,9 +20,7 @@ Summary: An OBS source service: running all the osc source-validator checks License: GPL-2.0+ Group: Development/Tools/Building -Summary: An OBS source service: defines all source-validator checks used by Factory -Group: Development/Tools/Building -Version: 0.4 +Version: 0.5 Release: 0 # use osc service dr to update Source: %{name}-%{version}.tar.bz2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.R2brGf/_old 2014-10-01 07:40:43.000000000 +0200 +++ /var/tmp/diff_new_pack.R2brGf/_new 2014-10-01 07:40:43.000000000 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="version">git-master</param> - <param name="versionformat">0.4</param> + <param name="versionformat">0.5</param> <param name="revision">master</param> </service> ++++++ obs-service-source_validator-0.4.tar.bz2 -> obs-service-source_validator-0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-source_validator-0.4/20-files-present-and-referenced new/obs-service-source_validator-0.5/20-files-present-and-referenced --- old/obs-service-source_validator-0.4/20-files-present-and-referenced 2014-08-14 02:08:46.000000000 +0200 +++ new/obs-service-source_validator-0.5/20-files-present-and-referenced 2014-09-29 12:22:59.000000000 +0200 @@ -149,6 +149,10 @@ } egrep -v '^warning' $TMPDIR/sources > $TMPDIR/sources.t && mv $TMPDIR/sources.t $TMPDIR/sources done +for i in $DIR_TO_CHECK/*.dsc ; do + test -f $i || continue + ( sed -ne '/^Files:/,$p' < $i | sed -e 1d | sed -e '/^[^ ]/,$d' | while read debchk debsize debfile ; do echo $debfile ; done ) >> $TMPDIR/sources +done test -f $TMPDIR/sources || cleanup_and_exit @@ -198,13 +202,13 @@ # if [ -f $DIR_TO_CHECK/*.keyring 2>/dev/null ]; then - gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --import $DIR_TO_CHECK/*.keyring + gpg --pgp2 -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --import $DIR_TO_CHECK/*.keyring for i in $DIR_TO_CHECK/*.sig $DIR_TO_CHECK/*.asc; do if [ -f "$i" ]; then validatefn=${i/.asc} validatefn=${validatefn/.sig} if [ -f "$validatefn" ]; then - gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" || { + gpg --pgp2 -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" || { echo "(E) signature $i does not validate" RETURN=2 } @@ -212,7 +216,7 @@ if [ -f "$validatefn.gz" ]; then TMPFILE=`mktemp` zcat "$validatefn.gz" > $TMPFILE - gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { + gpg --pgp2 -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { echo "(E) signature $i does not validate" RETURN=2 } @@ -221,7 +225,7 @@ if [ -f "$validatefn.bz2" ]; then TMPFILE=`mktemp` bzcat "$validatefn.bz2" > $TMPFILE - gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { + gpg --pgp2 -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { echo "(E) signature $i does not validate" RETURN=2 } @@ -230,7 +234,7 @@ if [ -f "$validatefn.xz" ]; then TMPFILE=`mktemp` xzcat "$validatefn.xz" > $TMPFILE - gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { + gpg --pgp2 -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { echo "(E) signature $i does not validate" RETURN=2 } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fonts-config for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package fonts-config for openSUSE:Factory checked in at 2014-10-01 07:40:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fonts-config (Old) and /work/SRC/openSUSE:Factory/.fonts-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fonts-config" Changes: -------- --- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes 2014-08-06 11:42:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes 2014-10-01 07:40:39.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 22 13:19:56 UTC 2014 - pgajdos(a)suse.com + +- fix version in fonts-config script + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonts-config ++++++ --- /var/tmp/diff_new_pack.o9fRuL/_old 2014-10-01 07:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o9fRuL/_new 2014-10-01 07:40:40.000000000 +0200 @@ -316,7 +316,7 @@ use strict; my $script_start_time = time(); -my $version = 20140321; +my $version = 20140604; # # OPTIONS -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-10-01 07:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-09-26 10:51:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-10-01 07:40:36.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 29 15:23:44 CEST 2014 - snwint(a)suse.de + +- start wpa_supplicant for wicked (bnc #898977) +- 14.143 + +------------------------------------------------------------------- +Mon Sep 29 14:23:52 CEST 2014 - snwint(a)suse.de + +- add wpa_supplicant to rescue system +- 14.142 + +------------------------------------------------------------------- Old: ---- installation-images-14.141.tar.xz New: ---- installation-images-14.143.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.df0Btc/_old 2014-10-01 07:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.df0Btc/_new 2014-10-01 07:40:38.000000000 +0200 @@ -358,10 +358,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.141 +Version: 14.143 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.141.tar.xz +Source: installation-images-14.143.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.141.tar.xz -> installation-images-14.143.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.141/VERSION new/installation-images-14.143/VERSION --- old/installation-images-14.141/VERSION 2014-09-25 16:25:23.000000000 +0200 +++ new/installation-images-14.143/VERSION 2014-09-29 15:23:01.000000000 +0200 @@ -1 +1 @@ -14.141 +14.143 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.141/changelog new/installation-images-14.143/changelog --- old/installation-images-14.141/changelog 2014-09-25 16:26:20.000000000 +0200 +++ new/installation-images-14.143/changelog 2014-09-29 15:23:43.000000000 +0200 @@ -1,3 +1,9 @@ +2014-09-29: 14.143 + - start wpa_supplicant for wicked + +2014-09-29: 14.142 + - add wpa_supplicant to rescue system + 2014-09-25: 14.141 - add splash=silent to enable plymouth on uefi systems (bnc #897461) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.141/data/initrd/initrd.file_list new/installation-images-14.143/data/initrd/initrd.file_list --- old/installation-images-14.141/data/initrd/initrd.file_list 2014-09-24 14:31:14.000000000 +0200 +++ new/installation-images-14.143/data/initrd/initrd.file_list 2014-09-29 14:49:43.000000000 +0200 @@ -192,7 +192,7 @@ if exists(wpa_supplicant) wpa_supplicant: - /usr/sbin + / wireless-tools: /usr/sbin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.141/data/initrd/scripts/early_setup new/installation-images-14.143/data/initrd/scripts/early_setup --- old/installation-images-14.141/data/initrd/scripts/early_setup 2014-06-17 12:03:40.000000000 +0200 +++ new/installation-images-14.143/data/initrd/scripts/early_setup 2014-09-29 15:07:11.000000000 +0200 @@ -34,6 +34,10 @@ /bin/dbus-daemon --system fi +if [ -x /usr/sbin/wpa_supplicant ] ; then + /usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -B -f /var/log/wpa_supplicant.log +fi + if [ -x usr/sbin/wickedd ] ; then debug_opts="--debug mini --log-target stderr:time,pid,ident" if [ -n "$linuxrc_debug" ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.141/data/rescue/rescue.file_list new/installation-images-14.143/data/rescue/rescue.file_list --- old/installation-images-14.141/data/rescue/rescue.file_list 2014-09-09 11:02:50.000000000 +0200 +++ new/installation-images-14.143/data/rescue/rescue.file_list 2014-09-29 12:17:12.000000000 +0200 @@ -66,6 +66,7 @@ ?s390-tools: ?silo: ?wireless-tools: +?wpa_supplicant: aaa_base-extras: attr: bash: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2014-10-01 07:40:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2014-09-25 08:42:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2014-10-01 07:40:32.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Sep 25 13:00:23 UTC 2014 - dvaleev(a)suse.com + +- Fix ppc64 build (bnc#893275 bnc#871128) + u_be_assert_include.patch + Add ncurses-devel as build dependency to build with -ltinfo +- Enable llvm on ppc64le (llvm3.5 got ppc64le support) +- Enable shared on ppc64 and ppc64le + +------------------------------------------------------------------- New: ---- u_be_assert_include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.m7SFz9/_old 2014-10-01 07:40:34.000000000 +0200 +++ /var/tmp/diff_new_pack.m7SFz9/_new 2014-10-01 07:40:34.000000000 +0200 @@ -29,7 +29,7 @@ %else %define gallium_loader 0 %endif -%ifarch %ix86 x86_64 %arm ppc64 ppc64le +%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le %define vdpau_r600 1 %else %define vdpau_r600 0 @@ -39,24 +39,17 @@ %else %define llvm_r600 0 %endif -%ifarch %ix86 x86_64 %arm ppc64 +%ifarch %ix86 x86_64 %arm ppc64 ppc64le %define xvmc_support 1 %else %define xvmc_support 0 %endif -%ifarch %ix86 x86_64 %arm ppc64 +%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le %define vdpau_nouveau 1 %else %define vdpau_nouveau 0 %endif -# llvm-config on ppc64 is currently broken (bnc#871128) -# /usr/lib64/libLLVMSupport.a(Process.cpp.o): In function `llvm::sys::Process::FileDescriptorHasColors(int)': -# /home/abuild/rpmbuild/BUILD/llvm/lib/Support/Process.cpp:(.text+0xcd4): undefined reference to `setupterm' -%ifarch ppc64 -%define egl_gallium 0 -%endif - %define _name_archive MesaLib %define _version 10.3.0 @@ -110,8 +103,9 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%ifarch %arm ppc64 s390x %ix86 x86_64 +%ifarch %arm ppc64 ppc64le s390x %ix86 x86_64 BuildRequires: llvm-devel +BuildRequires: ncurses-devel %endif BuildRequires: libXvMC-devel BuildRequires: libvdpau-devel @@ -150,6 +144,7 @@ # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch Patch17: u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch +Patch18: u_be_assert_include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -516,6 +511,7 @@ #%patch13 -p1 ### %patch17 -p1 +%patch18 -p1 %build rm -f src/mesa/depend @@ -565,12 +561,9 @@ --enable-vdpau \ --enable-xvmc \ %endif -%ifarch %arm ppc64 +%ifarch %arm ppc64 ppc64le --enable-xa \ --enable-gallium-llvm \ -%ifarch ppc64 - --disable-llvm-shared-libs \ -%endif --with-dri-drivers=nouveau \ %ifarch %arm --with-gallium-drivers=r300,r600,nouveau,swrast,svga,freedreno \ @@ -646,7 +639,7 @@ %post -n libgbm1 -p /sbin/ldconfig %postun -n libgbm1 -p /sbin/ldconfig -%ifarch %ix86 x86_64 %arm ppc64 s390x +%ifarch %ix86 x86_64 %arm ppc64 ppc64le s390x %post -n libxatracker2 -p /sbin/ldconfig %postun -n libxatracker2 -p /sbin/ldconfig %endif @@ -777,7 +770,7 @@ %_libdir/libgbm.so %_libdir/pkgconfig/gbm.pc -%ifarch %ix86 x86_64 %arm ppc64 s390x +%ifarch %ix86 x86_64 %arm ppc64 ppc64le s390x %files -n libxatracker2 %defattr(-,root,root) %_libdir/libxatracker.so.2* ++++++ u_be_assert_include.patch ++++++ >From 83349c31a0e0997ea79bd2832cf9b80e7e22bbc0 Mon Sep 17 00:00:00 2001 From: Dinar Valeev <dvaleev(a)suse.com> Date: Mon, 29 Sep 2014 11:48:01 +0000 Subject: [PATCH] Fix missing include for BigEndian systems Patch-Mainline: "To be upstreamed" Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/gallium/auxiliary/util/u_math.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index 39bd40f..d4e3c12 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -51,6 +51,7 @@ extern "C" { #include <math.h> #include <float.h> #include <stdarg.h> +#include <assert.h> #ifdef PIPE_OS_UNIX #include <strings.h> /* for ffs */ -- 1.7.12.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghostscript for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package ghostscript for openSUSE:Factory checked in at 2014-10-01 07:40:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghostscript (Old) and /work/SRC/openSUSE:Factory/.ghostscript.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghostscript" Changes: -------- --- /work/SRC/openSUSE:Factory/ghostscript/ghostscript-mini.changes 2014-09-25 08:42:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghostscript.new/ghostscript-mini.changes 2014-10-01 07:40:28.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Sep 28 18:00:37 CEST 2014 - ro(a)suse.de + +- readd ppc64le patch ppc64le-support.patch (adapted for lcms2 in + Ghostscript version 9.15): the tests in lcms2.h cannot work + without "include <endian.h>" that is now added and + regardless that lcms is not used by default (unless the + configure option --with-lcms is set), lcms is again fixed + (see http://bugs.ghostscript.com/show_bug.cgi?id=695544). + +------------------------------------------------------------------- ghostscript.changes: same change New: ---- ppc64le-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.6cP5VX/_old 2014-10-01 07:40:32.000000000 +0200 +++ /var/tmp/diff_new_pack.6cP5VX/_new 2014-10-01 07:40:32.000000000 +0200 @@ -65,6 +65,10 @@ # Source10...Source99 is for sources from SUSE which are intended for upstream: # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +Patch11: ppc64le-support.patch # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -137,6 +141,10 @@ # Be quiet when unpacking and # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +%patch11 -p1 %build # Set our preferred architecture-specific flags for the compiler and linker: ++++++ ghostscript.spec ++++++ --- /var/tmp/diff_new_pack.6cP5VX/_old 2014-10-01 07:40:32.000000000 +0200 +++ /var/tmp/diff_new_pack.6cP5VX/_new 2014-10-01 07:40:32.000000000 +0200 @@ -71,6 +71,10 @@ # Source10...Source99 is for sources from SUSE which are intended for upstream: # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +Patch11: ppc64le-support.patch # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -260,6 +264,10 @@ # Be quiet when unpacking and # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +%patch11 -p1 %build # Set our preferred architecture-specific flags for the compiler and linker: ++++++ ppc64le-support.patch ++++++ --- ghostscript-9.15/lcms/include/lcms.h +++ ghostscript-9.15/lcms/include/lcms.h @@ -140,11 +140,15 @@ #endif #if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(sparc) || defined(__ppc__) || defined(__s390__) || defined(__s390x__) +# ifndef __LITTLE_ENDIAN__ # define USE_BIG_ENDIAN 1 +# endif #endif #if TARGET_CPU_PPC +# ifndef __LITTLE_ENDIAN__ # define USE_BIG_ENDIAN 1 +# endif #endif #if macintosh --- ghostscript-9.15/lcms2/include/lcms2.h +++ ghostscript-9.15/lcms2/include/lcms2.h @@ -67,6 +67,7 @@ #include <limits.h> #include <time.h> #include <stddef.h> +#include <endian.h> #ifndef CMS_USE_CPP_API # ifdef __cplusplus -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-10-01 07:40:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-09-28 19:55:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-10-01 07:40:26.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 29 11:55:37 CEST 2014 - aschnell(a)suse.de + +- updated translations + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.2.4.tar.bz2 ++++++ ++++ 16833 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-10-01 07:40:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-09-28 19:56:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-10-01 07:40:24.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 11:52:38 CEST 2014 - aschnell(a)suse.de + +- updated translations (bsc#877325) +- 2.25.16 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.15.tar.bz2 New: ---- libstorage-2.25.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.UblDTA/_old 2014-10-01 07:40:25.000000000 +0200 +++ /var/tmp/diff_new_pack.UblDTA/_new 2014-10-01 07:40:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.15 +Version: 2.25.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.25.15.tar.bz2 -> libstorage-2.25.16.tar.bz2 ++++++ ++++ 81683 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vim for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package vim for openSUSE:Factory checked in at 2014-10-01 07:40:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vim (Old) and /work/SRC/openSUSE:Factory/.vim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vim" Changes: -------- --- /work/SRC/openSUSE:Factory/vim/vim.changes 2014-09-17 17:41:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new/vim.changes 2014-10-01 07:40:21.000000000 +0200 @@ -1,0 +2,38 @@ +Mon Sep 29 11:28:00 UTC 2014 - idonmez(a)suse.com + +- Updated to revision 461, fixes the following problems + * When using a Visual selection of multiple words and doing CTRL-W_] + it jumps to the tag matching the word under the cursor, not the + selected text. (Patrick hemmer) + * Completion for :buf does not use 'wildignorecase'. (Akshay H) + * 'backupcopy' is global, cannot write only some files in a + different way. + * Using getchar() in an expression mapping may result in K_CURSORHOLD, + which can't be recognized. + * Issue 252: Cursor moves in a zero-height window. + * Can't change the icon after building Vim. + * Can't build without the quickfix feature. (Erik Falor) + * Error reported by ubsan when running test 72. + * Reversed question mark not recognized as punctuation. (Issue 258) + * Clipboard may be cleared on startup. + * In some situations, when setting up an environment to trigger an + autocommand, the environment is not properly restored. + * Spell files from Hunspell may generate a lot of errors. + * Using ETO_IGNORELANGUAGE causes problems. + * Can't easily close the help window. (Chris Gaal) + * Not all commands that edit another buffer support the +cmd + argument. + * Calling system() with empty input gives an error for writing the + temp file. + +------------------------------------------------------------------- +Fri Sep 26 09:51:50 UTC 2014 - zaitor(a)opensuse.org + +- Add gvim.svg as Source24, taken from gnome-colors-icon-theme. + Convert the svg to all relevant hicolor sizes, and install them. +- Add rsvg-view BuildRequires: Needed to do the above conversion. +- Call relevant macros in %post/%postun: + + %icon_theme_cache_post/postun because the package ships themed + icons. + +------------------------------------------------------------------- Old: ---- vim-7.4.442.hg.6214.tar.xz New: ---- gvim.svg vim-7.4.461.hg.6253.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.r1nmO6/_old 2014-10-01 07:40:23.000000000 +0200 +++ /var/tmp/diff_new_pack.r1nmO6/_new 2014-10-01 07:40:23.000000000 +0200 @@ -17,8 +17,8 @@ %define pkg_version 7.4 -%define patchlevel 442 -%define revision 6214 +%define patchlevel 461 +%define revision 6253 %define VIM_SUBDIR vim74 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} @@ -44,6 +44,8 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: python3-devel +# Needed to convert svg to png +BuildRequires: rsvg-view BuildRequires: ruby-devel BuildRequires: update-desktop-files # @@ -87,6 +89,7 @@ Source19: gvim.desktop Source20: spec.skeleton Source23: apparmor.vim +Source24: gvim.svg Source99: %{name}-7.4-rpmlintrc Patch3: %{name}-7.4-disable_lang_no.patch Patch4: %{name}-7.3-gvimrc_fontset.patch @@ -239,9 +242,15 @@ gcc %{optflags} %{SOURCE13} -o vitmp %install -# create icon directory to have the icon from the tarball installed -install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps %makeinstall STRIP=: +# create icon directory to have the icons installed and convert them to all hicolor expected sizes. +for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do + SIZE=$(echo $size | awk -Fx {'print $2}') + install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps + rsvg-convert -h ${SIZE} -w ${SIZE} %{S:24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png +done +install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps +install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/gvim.svg # the last installed binary is gvim. preserve it and # fix its symlinks. e* was added here as it doesnt make much sense in @@ -342,6 +351,12 @@ # Look for "TEST FAILURE" in the build log make test +%post -n gvim +%icon_theme_cache_post + +%postun -n gvim +%icon_theme_cache_postun + %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/vimrc @@ -489,7 +504,7 @@ %{_bindir}/rgvim # menu icon %{_datadir}/applications/gvim.desktop -%{_datadir}/icons/hicolor/48x48/apps/gvim.png +%{_datadir}/icons/hicolor/*/apps/gvim.* %doc %{_docdir}/gvim %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.r1nmO6/_old 2014-10-01 07:40:23.000000000 +0200 +++ /var/tmp/diff_new_pack.r1nmO6/_new 2014-10-01 07:40:23.000000000 +0200 @@ -1,10 +1,10 @@ <services> <service name="tar_scm" mode="disabled"> <param name="scm">hg</param> - <param name="url">https://code.google.com/p/vim/</param> + <param name="url">https://code.google.com/p/vim</param> <param name="filename">vim</param> - <param name="versionprefix">7.4.442.hg</param> - <param name="revision">v7-4-442</param> + <param name="versionprefix">7.4.461.hg</param> + <param name="revision">v7-4-461</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> ++++++ vim-7.4.442.hg.6214.tar.xz -> vim-7.4.461.hg.6253.tar.xz ++++++ /work/SRC/openSUSE:Factory/vim/vim-7.4.442.hg.6214.tar.xz /work/SRC/openSUSE:Factory/.vim.new/vim-7.4.461.hg.6253.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0