April 2013 - openSUSE Commits - openSUSE Mailing Lists

commit icedtea-web.1594 for openSUSE:12.3:Update
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package icedtea-web.1594 for openSUSE:12.3:Update checked in at 2013-04-29 10:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/icedtea-web.1594 (Old) and /work/SRC/openSUSE:12.3:Update/.icedtea-web.1594.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icedtea-web.1594", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:12.3:Update/.icedtea-web.1594.new/icedtea-web.changes 2013-04-29 10:33:06.000000000 +0200 @@ -0,0 +1,243 @@ +------------------------------------------------------------------- +Wed Apr 17 14:11:32 UTC 2013 - mvyskocil(a)suse.com + +- update to 1.3.2 (bnc#815596) +- Security Updates + * CVE-2013-1927, RH884705: fixed gifar vulnerability + * CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path. +- Common + * Added new option in itw-settings which allows users to set JVM arguments + when plugin is initialized. +- NetX + * PR580: http://www.horaoficial.cl/ loads improperly +- Plugin + * PR1260: IcedTea-Web should not rely on GTK + obsoletes icedtea-web-remove-gtk-dep.patch + * PR1157: Applets can hang browser after fatal exception + +------------------------------------------------------------------- +Sat Jan 19 22:55:39 UTC 2013 - zaitor(a)opensuse.org + +- Add icedtea-web-remove-gtk-dep.patch, build icedtea-web without + GTK. Plugin now works in both gtk2 and gtk3 based browsers. + +------------------------------------------------------------------- +Wed Jan 16 15:03:43 UTC 2013 - mvyskocil(a)suse.com + +- limit the provides/obsoletes to architectures, where -plugin package + existed and don't pollute shiny new arm with an old garbage + +------------------------------------------------------------------- +Tue Jan 15 21:17:00 UTC 2013 - dmueller(a)suse.com + +- handle the package renaming on arm properly + +------------------------------------------------------------------- +Wed Nov 7 08:44:05 UTC 2012 - mvyskocil(a)suse.com + +- update to 1.3.1 (bnc#787846) +- Security Updates + * CVE-2012-4540, RH869040: Heap-based buffer overflow after triggering event attached to applet +- Common + - PR1161: X509VariableTrustManager does not work correctly with OpenJDK7 + fixes the self-signed issue (mentioned in bnc#784859, bnc#785333, bnc#786775) + +------------------------------------------------------------------- +Mon Sep 10 08:29:27 UTC 2012 - mvyskocil(a)suse.cz + +- update to 1.3 (bnc#779001) +- New features: + * Web Start launch errors are now printed to give proper indication as to the + cause + * Significant performance improvement when loading applets that refer to + missing classes + * Support for latest versions of Chromium + * Security warning dialog improvements to better clarify security request + * Support build with GTK2 and GTK3 + * Cookie write support (i.e set cookies in browser via Java/Applet) +- Common: + * Applet window icon improved +- Plug-in: + * PR975: Ignore classpaths specified in jar manifests when using jnlp_href + * PR1011: Treat folders as such when specified in archive tags + * PR855: AppletStub getDocumentBase() now returns full URL + * PR722: Unsigned META-INF entries are ignored + * PR861: Jars can now load from non codebase hosts + * PR1106: Icedtea 1.2.1 crashes Firefox 14 +- Web Start: + * PR898: Large signed JNLP files now supported + * PR811: URLs with spaces now handled correctly +- drop already upstreamed icetea-web-1.2.1-old-xulrunner-typo.patch + +------------------------------------------------------------------- +Wed Aug 8 12:55:43 UTC 2012 - mvyskocil(a)suse.cz + +- fix PR1106: Icedtea 1.2.1 crashes Firefox 14 + * http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1106 + +------------------------------------------------------------------- +Thu Aug 2 08:35:25 UTC 2012 - mvyskocil(a)suse.cz + +- update to 1.2.1 (bnc#773458) +- Security Updates + * CVE-2012-3422, RH840592: Potential read from an uninitialized memory location + * CVE-2012-3423, RH841345: Incorrect handling of not 0-terminated strings +- NetX + * PR898: signed applications with big jnlp-file doesn't start (webstart affect like "frozen") + * PR811: javaws is not handling urls with spaces (and other characters needing encoding) correctly + * 816592: icedtea-web not loading GeoGebra java applets in Firefox or Chrome +- Plugin + * PR863: Error passing strings to applet methods in Chromium + * PR895: IcedTea-Web searches for missing classes on each loadClass or findClass + * PR518: NPString.utf8characters not guaranteed to be nul-terminated +- Common + * RH838417: Disambiguate signed applet security prompt from certificate warning + * RH838559: Disambiguate signed applet security prompt from certificate warning + +------------------------------------------------------------------- +Mon Jun 25 14:01:12 UTC 2012 - mvyskocil(a)suse.cz + +- require java-1_7_0-openjdk for build and installation + +------------------------------------------------------------------- +Tue Mar 6 12:55:36 UTC 2012 - mvyskocil(a)suse.cz + +- update to 1.2 +- New features: + * Signed JNLP support + * Support for client authentication certificates + * Cache size enforcement now supported via itweb-settings + * Applet parameter passing through JNLP files now supported + * Better icons for access warning dialog + * Security Dialog UI revamped to make it look less threatening when appropriate +- Fixes (plugin, webstart, common) + * PR618: Can't install OpenDJ, JavaWebStart fails with Input stream is null error + * PR765: JNLP file with all resource jars marked as 'lazy' fails to validate signature and stops the launch of application + * PR788: Elluminate Live! is not working + * PR804: javaws launcher incorrectly handles file names with spaces + * PR820, bnc#746895: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp + * PR838: IcedTea plugin crashes with chrome browser when javascript is executed + * PR852: Classloader not being flushed after last applet from a site is closed + * RH586194: Unable to connect to connect with Juniper VPN client + * PR771: IcedTea-Web certificate verification code does not use the right API + * PR742: IcedTea-Web checks certs only upto 1 level deep before declaring them untrusted. + * PR789: typo in jrunscript.sh + * PR808: javaws is unable to start, when missing jars are enumerated before main jar + * RH738814: Access denied at ssl handshake + * Support for authenticating using client certificates +- fix bnc#737105/FATE#313084: add Supplements: packageand(broswer(npapi):java-openjdk) + ensures the web plugin is pulled in when openjdk and capable browser is installed + +------------------------------------------------------------------- +Mon Mar 5 13:24:29 UTC 2012 - mvyskocil(a)suse.cz + +- enable make check in respective section + +------------------------------------------------------------------- +Mon Nov 14 10:19:16 UTC 2011 - mvyskocil(a)suse.cz + +- update to 1.1.4 (fixes bnc#729870) + - RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and + suffix domain SOP bypass + - PR778: Jar download and server certificate verification deadlock + +------------------------------------------------------------------- +Mon Oct 24 09:14:10 UTC 2011 - mvyskocil(a)suse.cz + +- update to 1.1.3: + - PR782: Support building against npapi-sdk as well + * drop the added patch + - PR794: IcedTea-Web does not work if a Web Start app jar has a + Class-Path element in the manifest +- icedtea-web-npapi-sdk-r5.patch for build with npapi-sdk we have + in openSUSE + +------------------------------------------------------------------- +Mon Oct 10 11:19:41 UTC 2011 - gber(a)opensuse.org + +- fix icedtea-web-suse-desktop-files.patch, itweb-settings is a + desktop setting and should not show up twice in two unrelated + top-level menus; also add a trailing semicolon + +------------------------------------------------------------------- +Thu Sep 15 08:33:59 UTC 2011 - mvyskocil(a)suse.cz + +- Build with a npapi-sdk and xulrunner-devel from openSUSE 12.1 + +------------------------------------------------------------------- +Tue Sep 6 06:50:15 UTC 2011 - cfarrell(a)suse.com + +- license update: GPL-2.0-with-classpath-exception + SPDX syntax. See http://spdx.org/licenses + +------------------------------------------------------------------- +Fri Sep 2 09:36:00 UTC 2011 - mvyskocil(a)suse.cz + +- update to 1.1.2 + * PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow + * RH718693: MindTerm SSH Applet doesn’t work + * PR768: Signed applets/Web Start apps don’t work with OpenJDK7 and up + * PR769: IcedTea-Web does not work with some ssl sites with OpenJDK7 + * RH734081: Javaws cannot use proxy settings from Firefox + * New (--with-jre-home=) option to allow use with only JRE installed +- use a common jre location libdir/jvm/jre instead of openjdk6 +- obsoleted CVE patches + +------------------------------------------------------------------- +Wed Jul 20 13:18:38 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#704309 - VUL-0: icedtea/icedtea-web two issues + * CVE-2011-2513 + * CVE-2011-2514 +- use --with-java instead of patching of launchers as + suggested by upstream + +------------------------------------------------------------------- +Fri Jul 8 08:03:40 UTC 2011 - mvyskocil(a)suse.cz + ++++ 46 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.icedtea-web.1594.new/icedtea-web.changes New: ---- icedtea-web-1.0.2-no-return-in-nonvoid-function.patch icedtea-web-1.1-moonlight-symbol-clash.patch icedtea-web-1.3.2.tar.gz icedtea-web-suse-desktop-files.patch icedtea-web.changes icedtea-web.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ # # spec file for package icedtea-web # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # this is the right version openjdk for us! %define openjdk_ver 1.6.0.0_b22.1.10.1 %ifarch %arm %define origin icedtea %else %define origin openjdk %endif # for openSUSE 11.1 we need use update repo as it were not # released with this version %define xulrunner_ver 191 %if 0%{?suse_version} > 1130 %define xulrunner_ver 20 %endif %if 0%{?suse_version} == 1130 %define xulrunner_ver 192 %endif %define with_npapisdk 0 %if 0%{?suse_version} > 1140 %define with_npapisdk 1 %endif %ifarch %{ix86} %define archinstall i386 %endif %ifarch x86_64 %define archinstall amd64 %endif %define priority 17106 %define javaver 1.7.0 # use a same name of alternatives as Sun/IBM Java %define javaplugin javaplugin %define pluginsdir %{_libdir}/browser-plugins %define sdkdir java-%{javaver}-%{origin}-%{javaver} %define pluginpath %{_libdir} %define pluginname IcedTeaPlugin.so Name: icedtea-web Version: 1.3.2 Release: 0 Summary: Java Web Start and plugin implementation License: GPL-2.0-with-classpath-exception Group: Development/Languages/Java Url: http://icedtea.classpath.org Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz Patch0: icedtea-web-1.0.2-no-return-in-nonvoid-function.patch #PATCH-FIX-UPSTREAM: # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch1: icedtea-web-1.1-moonlight-symbol-clash.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: java-1_7_0-%{origin}-devel BuildRequires: libX11-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.9.0 BuildRequires: zlib-devel # IcedTeaPlugin build requirements. BuildRequires: glib2-devel %if %{with_npapisdk} BuildRequires: pkgconfig(npapi-sdk) #FIXME: use after deprecation of mozilla-xulrunner* packages from Factory #BuildRequires: pkgconfig(libxul) BuildRequires: xulrunner-devel %else BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel %endif %if %defined suse_version BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: procps BuildRequires: update-desktop-files BuildRequires: zip %endif # to make sure the new package is installed in time of post Requires(post): java-1_7_0-%{origin} # Post requires alternatives to install tool alternatives. Requires(post): update-alternatives # Postun requires alternatives to uninstall tool alternatives. Requires(postun): update-alternatives Provides: java-plugin = %{javaver} %ifarch %{ix86} x86_64 # limit the provides/obsoleted only on arches when old package have existed Provides: java-1_6_0-openjdk-plugin = %{openjdk_ver} Obsoletes: java-1_6_0-openjdk-plugin < %{openjdk_ver} %endif # bnc#737105/FATE#313084 Supplements: packageand(browser(npapi):java-%{origin}) %description The IcedTea-Web project provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project. %package javadoc Summary: API documentation for %{name} Group: Documentation/Other %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %description javadoc This package contains Javadocs for the %{name}. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch1000 -p1 %build %{configure} \ --with-jdk-home=%{_jvmdir}/%{sdkdir} \ --with-jre-home=%{_jvmdir}/jre/ \ --docdir=%{_javadocdir}/%{name} \ --with-pkgversion=suse-%{release}-%{_arch} make %install %{makeinstall} # the --program-suffix rename both binaries, so let's handle it here mv %{buildroot}/%{_bindir}/javaws %{buildroot}/%{_bindir}/itweb-javaws # and manual page is still used in u-a, so let's move it mv %{buildroot}/%{_mandir}/man1/javaws.1 %{buildroot}/%{_datadir}/%{name}/ rm -rf %{buildroot}/%{_mandir} # Install desktop files. install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps} cp javaws.png %{buildroot}%{_datadir}/pixmaps for d in javaws itweb-settings; do install -m 0644 $d.desktop %{buildroot}/%{_datadir}/applications/ %suse_update_desktop_file $d done # needs for sle-11-sp1 and openSUSE evergreen export NO_BRP_CHECK_BYTECODE_VERSION=true %clean rm -rf %{buildroot} %check %{__make} check %posttrans # java-1_6_0-openjdk-plugin -> icedtea-web is remove of the first package # which causes a javaplugin removal, so let's move it here /usr/sbin/update-alternatives \ --install %{pluginsdir}/javaplugin.so %{javaplugin} \ %{pluginpath}/%{pluginname} %{priority} \ --slave %{_bindir}/javaws javaws %{_bindir}/itweb-javaws \ --slave %{_mandir}/man1/javaws.1 javaws.1 \ %{_datadir}/%{name}/javaws.1 %postun if [ $1 -eq 0 ] then update-alternatives --remove %{javaplugin} \ %{pluginpath}/%{pluginname} fi %files %defattr(-,root,root,-) %doc NEWS README COPYING %{_bindir}/itweb-settings %{_bindir}/itweb-javaws %{pluginpath}/%{pluginname} %{_datadir}/%{name} %{_datadir}/applications/itweb-settings.desktop %{_datadir}/applications/javaws.desktop %{_datadir}/pixmaps/javaws.png %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog ++++++ icedtea-web-1.0.2-no-return-in-nonvoid-function.patch ++++++ Index: icedtea-web-1.0.2/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc =================================================================== --- icedtea-web-1.0.2.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2011-04-02 23:52:41.000000000 +0200 +++ icedtea-web-1.0.2/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2011-04-06 14:17:44.458931121 +0200 @@ -816,6 +816,7 @@ } pthread_cleanup_pop(1); + return NULL; } /****************************************** ++++++ icedtea-web-1.1-moonlight-symbol-clash.patch ++++++ --- plugin/icedteanp/IcedTeaNPPlugin.cc | 8 ++++---- plugin/icedteanp/IcedTeaNPPlugin.h | 2 +- plugin/icedteanp/IcedTeaPluginUtils.cc | 12 ++++++------ plugin/icedteanp/IcedTeaPluginUtils.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) Index: icedtea-web-1.3.2/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== --- icedtea-web-1.3.2.orig/plugin/icedteanp/IcedTeaNPPlugin.cc +++ icedtea-web-1.3.2/plugin/icedteanp/IcedTeaNPPlugin.cc @@ -257,8 +257,8 @@ static gint instance_counter = 1; static GPid appletviewer_pid = -1; static guint appletviewer_watch_id = -1; -int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL; -int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) && +int icedtea_plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL; +int icedtea_plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) && (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0); pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER; @@ -1612,14 +1612,14 @@ plugin_start_appletviewer (ITNPPluginDat command_line.push_back("-classpath"); command_line.push_back(ICEDTEA_WEB_JRE "/lib/rt.jar"); - if (plugin_debug) + if (icedtea_plugin_debug) { command_line.push_back("-Xdebug"); command_line.push_back("-Xnoagent"); //Debug flags std::string debug_flags = "-Xrunjdwp:transport=dt_socket,address=8787,server=y,"; - debug_flags += plugin_debug_suspend ? "suspend=y" : "suspend=n"; + debug_flags += icedtea_plugin_debug_suspend ? "suspend=y" : "suspend=n"; command_line.push_back(debug_flags); } Index: icedtea-web-1.3.2/plugin/icedteanp/IcedTeaNPPlugin.h =================================================================== --- icedtea-web-1.3.2.orig/plugin/icedteanp/IcedTeaNPPlugin.h +++ icedtea-web-1.3.2/plugin/icedteanp/IcedTeaNPPlugin.h @@ -98,7 +98,7 @@ extern pthread_t itnp_plugin_thread_id; extern pthread_mutex_t pluginAsyncCallMutex; // debug switch -extern int plugin_debug; +extern int icedtea_plugin_debug; // Browser function table. extern NPNetscapeFuncs browser_functions; Index: icedtea-web-1.3.2/plugin/icedteanp/IcedTeaPluginUtils.cc =================================================================== --- icedtea-web-1.3.2.orig/plugin/icedteanp/IcedTeaPluginUtils.cc +++ icedtea-web-1.3.2/plugin/icedteanp/IcedTeaPluginUtils.cc @@ -398,7 +398,7 @@ IcedTeaPluginUtilities::getUTF16LEString wchar_t c; - if (plugin_debug) printf("Converted UTF-16LE string: "); + if (icedtea_plugin_debug) printf("Converted UTF-16LE string: "); result_unicode_str->clear(); for (int i = begin; i < begin+length; i+=2) @@ -412,14 +412,14 @@ IcedTeaPluginUtilities::getUTF16LEString (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) { - if (plugin_debug) printf("%c", c); + if (icedtea_plugin_debug) printf("%c", c); } result_unicode_str->push_back(c); } // not routing via debug print macros due to wide-string issues - if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length()); + if (icedtea_plugin_debug) printf(". Length=%d\n", result_unicode_str->length()); } /* @@ -433,7 +433,7 @@ IcedTeaPluginUtilities::printStringVecto { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; std::string* str = new std::string(); @@ -613,7 +613,7 @@ void IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector) { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; std::string* str = new std::string(); @@ -637,7 +637,7 @@ void IcedTeaPluginUtilities::printNPVariant(NPVariant variant) { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; if (NPVARIANT_IS_VOID(variant)) Index: icedtea-web-1.3.2/plugin/icedteanp/IcedTeaPluginUtils.h =================================================================== --- icedtea-web-1.3.2.orig/plugin/icedteanp/IcedTeaPluginUtils.h +++ icedtea-web-1.3.2/plugin/icedteanp/IcedTeaPluginUtils.h @@ -69,7 +69,7 @@ exception statement from your version. * #define PLUGIN_DEBUG(...) \ do \ { \ - if (plugin_debug) \ + if (icedtea_plugin_debug) \ { \ fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \ fprintf (stderr, __VA_ARGS__); \ ++++++ icedtea-web-suse-desktop-files.patch ++++++ Index: icedtea-web-1.0.2/itweb-settings.desktop.in =================================================================== --- icedtea-web-1.0.2.orig/itweb-settings.desktop.in 2011-04-02 23:52:41.000000000 +0200 +++ icedtea-web-1.0.2/itweb-settings.desktop.in 2011-04-05 16:00:05.579938163 +0200 @@ -1,8 +1,9 @@ [Desktop Entry] Name=IcedTea Web Control Panel +GenericName=IcedTea Web Control Panel Comment=Configure IcedTea Web (javaws and plugin) Exec=PATH_TO_ITWEB_SETTINGS Icon=javaws Terminal=false Type=Application -Categories=Settings; +Categories=Settings;DesktopSettings; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zhu3d for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package zhu3d for openSUSE:Factory checked in at 2013-04-29 10:04:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zhu3d (Old) and /work/SRC/openSUSE:Factory/.zhu3d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zhu3d", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/zhu3d/zhu3d.changes 2013-01-02 13:02:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zhu3d.new/zhu3d.changes 2013-04-29 10:04:55.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Apr 20 07:57:41 UTC 2013 - dmitry_r(a)opensuse.org + +- Update to version 4.2.6 + * Removed loading of real ancient Zhu3D-files + * Improved Makefile for compilations for newer Intel ICC + * Improved Czech translation. + * Cosmetic improvements/updates or typo-fixes elsewhere + * Removed obsolete zhu2d-4.2.4-glu-link.patch (upstream) + +------------------------------------------------------------------- Old: ---- zhu3d-4.2.4-glu-link.patch zhu3d-4.2.4.tar.gz New: ---- zhu3d-4.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zhu3d.spec ++++++ --- /var/tmp/diff_new_pack.7E8buD/_old 2013-04-29 10:04:57.000000000 +0200 +++ /var/tmp/diff_new_pack.7E8buD/_new 2013-04-29 10:04:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zhu3d # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006 Víctor Fernández Martínez. Valencia, Spain. # openSuse (c) 2006 pnemec(a)novell.com # Copyright (c) 2006 Pavel Nemec pnemec(a)suse.cz @@ -23,13 +23,12 @@ Summary: OpenGL-based equation viewer and solver License: GPL-3.0 Group: Productivity/Scientific/Math -Version: 4.2.4 +Version: 4.2.6 Release: 0 Url: http://sourceforge.net/projects/zhu3d/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: %{name}-pri.patch -Patch1: %{name}-4.2.4-glu-link.patch # PATCH-FIX-OPENSUSE zhu3d-no-compilation-date.patch - fix "W: file-contains-current-date" Patch2: %{name}-no-compilation-date.patch # PATCH-FIX-OPENSUSE zhu3d-ppc.patch - fixes ppc build @@ -64,11 +63,10 @@ %prep %setup -q %patch0 -%patch1 %patch2 -p1 %patch3 -p1 find . -type f -print0|xargs -0 chmod -x -sed -i 's/\r//' readme.txt license.gpl +sed -i 's/\r//' readme.txt license.gpl src/changelog.txt %build qmake SYSDIR=%{_datadir} QMAKE_CFLAGS_RELEASE="%{optflags}" QMAKE_CXXFLAGS_RELEASE="%{optflags}" @@ -104,6 +102,6 @@ %{_datadir}/icons/hicolor/ %{_datadir}/pixmaps/zhu3d.png %dir %{_datadir}/%{name} -%doc license.gpl readme.txt +%doc license.gpl readme.txt src/changelog.txt %changelog ++++++ zhu3d-4.2.4.tar.gz -> zhu3d-4.2.6.tar.gz ++++++ ++++ 6016 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 ucpp for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package ucpp for openSUSE:Factory checked in at 2013-04-29 10:04:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ucpp (Old) and /work/SRC/openSUSE:Factory/.ucpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ucpp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ucpp/ucpp.changes 2012-12-21 15:05:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ucpp.new/ucpp.changes 2013-04-29 10:04:35.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 20 11:37:41 UTC 2013 - tchvatal(a)suse.com + +- Add http url path. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ucpp.spec ++++++ --- /var/tmp/diff_new_pack.vtKyiN/_old 2013-04-29 10:04:36.000000000 +0200 +++ /var/tmp/diff_new_pack.vtKyiN/_new 2013-04-29 10:04:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ucpp # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,13 @@ Name: ucpp Summary: A quick and light preprocessor, but anyway fully compliant to C99 +License: BSD-3-Clause +Group: Development/Tools/Building Version: 1.3.4 Release: 0 -Group: Development/Tools/Building -License: BSD-3-Clause Url: http://code.google.com/p/ucpp/ # http://github.com/scarabeusiv/ucpp -Source: %{name}-%{version}.tar.xz +Source: http://dev.gentooexperimental.org/~scarabeus/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig BuildRequires: xz @@ -50,7 +50,6 @@ must be called repeatedly, otherwise ucpp is a stand-alone binary. %package -n %{libname} -License: BSD-3-Clause Summary: A Mixed Integer Linear Programming (MILP) Solver Library Group: Development/Libraries/Other @@ -73,7 +72,6 @@ must be called repeatedly, otherwise ucpp is a stand-alone binary. %package devel -License: BSD-3-Clause Requires: %{libname} = %{version} Summary: Files for Developing with ucpp Group: Development/Libraries/C and C++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit taglib for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package taglib for openSUSE:Factory checked in at 2013-04-29 10:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/taglib (Old) and /work/SRC/openSUSE:Factory/.taglib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "taglib", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/taglib/taglib.changes 2013-02-05 15:47:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.taglib.new/taglib.changes 2013-04-29 10:00:30.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 26 17:19:29 UTC 2013 - davejplater(a)gmail.com + +- Added taglib-1.8-ds-rusxmms-r8.patch which fixes bnc#814814 +- Removed old taglib-1.8-ds-rusxmms-r4.patch + +------------------------------------------------------------------- +Thu Apr 25 17:05:18 UTC 2013 - davejplater(a)gmail.com + +- Incorporated updated taglib-1.8-ds-rusxmms-r4.patch see bnc#814814 +- Added built binary examples which manipulate tags from the command line + to enable easier testing of libtag. These are in the taglib rpm. +- Created taglib-1.8-strip-rpath.patch to remove rpath from binaries. + +------------------------------------------------------------------- Old: ---- taglib-1.8-ds-rusxmms-r2.patch New: ---- taglib-1.8-ds-rusxmms-r8.patch taglib-1.8-strip-rpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taglib.spec ++++++ --- /var/tmp/diff_new_pack.tUmfwN/_old 2013-04-29 10:00:33.000000000 +0200 +++ /var/tmp/diff_new_pack.tUmfwN/_new 2013-04-29 10:00:33.000000000 +0200 @@ -21,15 +21,18 @@ Release: 0 Summary: Audio Meta-Data Library License: LGPL-2.1+ and MPL-1.1 -Group: System/Libraries +Group: Productivity/Multimedia/Other Url: http://ktown.kde.org/~wheeler/taglib/ Source0: https://github.com/downloads/taglib/taglib/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source100: baselibs.conf -Patch0: taglib-1.8-ds-rusxmms-r2.patch +# This patch is to fix bnc#814814. +Patch0: taglib-1.8-ds-rusxmms-r8.patch Patch1: taglib-1.7.2-doxygen.patch # PATCH-FIX-UPSTREAM taglib-1.8-version_fix.patch - fix version defines in taglib.h Patch2: taglib-1.8-version_fix.patch +# Get example executables to build without rpath +Patch3: taglib-1.8-strip-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen @@ -43,14 +46,18 @@ %endif BuildRequires: librcc-devel BuildRequires: zlib-devel -Requires: libtag1 = %{version} -Requires: libtag_c0 = %{version} +# NOTE: The tagreader and writer executables give different results when built with +# an earlier taglib-1.8-ds-rusxmms patch. See bnc#814814 +Requires: libtag1 = %{version}-%{release} +Requires: libtag_c0 = %{version}-%{release} %description TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files. +This package contains built examples which manipulate tags from the +command line. %package -n libtag1 Summary: Audio Meta-Data Library @@ -100,6 +107,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 %build mkdir build @@ -107,7 +115,12 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE" export CFLAGS="%{optflags} -D_GNU_SOURCE" _libsuffix=$(echo %{_lib} | cut -b4-) -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON .. +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DBUILD_TESTS:BOOL=ON \ + -DLIB_SUFFIX=$_libsuffix \ + -DWITH_ASF:BOOL=ON \ + -DWITH_MP4:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=ON .. make %{?_smp_mflags} VERBOSE=1 cd .. @@ -115,9 +128,9 @@ doxygen %install -cd build -%makeinstall -cd .. +pushd build +make DESTDIR=%{buildroot} install +popd # install susehelp file mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ @@ -133,11 +146,9 @@ cp -a AUTHORS COPYING.LGPL COPYING.MPL NEWS doc/html/ examples/ %{buildroot}%{_defaultdocdir}/libtag-devel/ %fdupes -s %{buildroot} - -echo <<EOF >README.taglib -This package only acts as a placeholder until all packages that use taglib -have upgraded to the new package names libtag1 and libtag_c0. -EOF +# Add built examples to taglib package. +mkdir -p %{buildroot}%{_bindir} +for i in `find build/examples -maxdepth 1 ! -type d -executable`; do cp -v ${i} %{buildroot}%{_bindir}/; done %check # check the library @@ -177,6 +188,11 @@ %files %defattr(-,root,root,-) +%if 1 == 1 +%{_bindir}/* +%exclude %{_bindir}/taglib-config +%else %doc README.taglib +%endif %changelog ++++++ taglib-1.8-ds-rusxmms-r2.patch -> taglib-1.8-ds-rusxmms-r8.patch ++++++ --- /work/SRC/openSUSE:Factory/taglib/taglib-1.8-ds-rusxmms-r2.patch 2013-02-05 15:47:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.taglib.new/taglib-1.8-ds-rusxmms-r8.patch 2013-04-29 10:00:30.000000000 +0200 @@ -1,6 +1,6 @@ diff -dPNur taglib-1.8/config-taglib.h.cmake taglib-1.8-ds/config-taglib.h.cmake --- taglib-1.8/config-taglib.h.cmake 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/config-taglib.h.cmake 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/config-taglib.h.cmake 2013-04-24 17:44:12.000000000 +0200 @@ -3,6 +3,8 @@ /* Define if you have libz */ #cmakedefine HAVE_ZLIB 1 @@ -12,7 +12,7 @@ #cmakedefine WITH_MP4 1 diff -dPNur taglib-1.8/ConfigureChecks.cmake taglib-1.8-ds/ConfigureChecks.cmake --- taglib-1.8/ConfigureChecks.cmake 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/ConfigureChecks.cmake 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/ConfigureChecks.cmake 2013-04-24 17:44:12.000000000 +0200 @@ -14,6 +14,8 @@ set(HAVE_ZLIB 0) endif() @@ -22,9 +22,33 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) find_package(CppUnit) if(NOT CppUnit_FOUND AND BUILD_TESTS) +diff -dPNur taglib-1.8/examples/tagreader_c.c taglib-1.8-ds/examples/tagreader_c.c +--- taglib-1.8/examples/tagreader_c.c 2012-09-06 20:03:15.000000000 +0200 ++++ taglib-1.8-ds/examples/tagreader_c.c 2013-04-24 19:10:37.000000000 +0200 +@@ -38,7 +38,7 @@ + TagLib_Tag *tag; + const TagLib_AudioProperties *properties; + +- taglib_set_strings_unicode(FALSE); ++// taglib_set_strings_unicode(FALSE); + + for(i = 1; i < argc; i++) { + printf("******************** \"%s\" ********************\n", argv[i]); +diff -dPNur taglib-1.8/examples/tagwriter.cpp taglib-1.8-ds/examples/tagwriter.cpp +--- taglib-1.8/examples/tagwriter.cpp 2012-09-06 20:03:15.000000000 +0200 ++++ taglib-1.8-ds/examples/tagwriter.cpp 2013-04-25 23:48:17.000000000 +0200 +@@ -92,7 +92,7 @@ + if(isArgument(argv[i]) && i + 1 < argc && !isArgument(argv[i + 1])) { + + char field = argv[i][1]; +- TagLib::String value = argv[i + 1]; ++ TagLib::String value(argv[i + 1], TagLib::String::Locale); + + TagLib::List<TagLib::FileRef>::Iterator it; + for(it = fileList.begin(); it != fileList.end(); ++it) { diff -dPNur taglib-1.8/taglib/CMakeLists.txt taglib-1.8-ds/taglib/CMakeLists.txt --- taglib-1.8/taglib/CMakeLists.txt 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/taglib/CMakeLists.txt 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/taglib/CMakeLists.txt 2013-04-24 17:44:12.000000000 +0200 @@ -35,6 +35,7 @@ audioproperties.h taglib_export.h @@ -52,7 +76,7 @@ set_target_properties(tag PROPERTIES diff -dPNur taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp --- taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp 2013-04-24 17:44:12.000000000 +0200 @@ -64,17 +64,18 @@ String ID3v1::StringHandler::parse(const ByteVector &data) const @@ -85,7 +109,7 @@ diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp --- taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp 2013-04-24 17:44:12.000000000 +0200 @@ -150,10 +150,10 @@ return; } @@ -116,7 +140,7 @@ v.append(textDelimiter(encoding)); diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp --- taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2013-04-24 17:44:12.000000000 +0200 @@ -187,12 +187,12 @@ // read the string data type (the first byte of the field data) @@ -151,19 +175,25 @@ diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.cpp taglib-1.8-ds/taglib/toolkit/rccpatch.cpp --- taglib-1.8/taglib/toolkit/rccpatch.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ taglib-1.8-ds/taglib/toolkit/rccpatch.cpp 2013-01-29 12:35:45.000000000 +0100 -@@ -0,0 +1,192 @@ ++++ taglib-1.8-ds/taglib/toolkit/rccpatch.cpp 2013-04-26 06:40:40.000000000 +0200 +@@ -0,0 +1,237 @@ +#include <stdlib.h> + +#include <string> +#include "tstring.h" +#include "tbytevector.h" + ++//#define RCC_DEBUG ++ ++ +#ifndef HAVE_LIBRCC +# include <config.h> +#endif + +#ifdef HAVE_LIBRCC ++# ifdef RCC_DEBUG ++# include <stdio.h> ++# endif /* RCC_DEBUG */ +# include <librcc.h> +# include <string.h> +#endif /* HAVE_LIBRCC */ @@ -188,7 +218,7 @@ +#endif /* HAVE_LIBRCC */ + + -+void rccPatchFree() { ++void rccTaglibPatchFree() { +#ifdef HAVE_LIBRCC + if (rcc_initialized) { + rccFree(); @@ -197,7 +227,7 @@ +#endif /* HAVE_LIBRCC */ +} + -+void rccPatchInit() { ++void rccTaglibPatchInit() { +#ifdef HAVE_LIBRCC + if (rcc_initialized) return; + rccInit(); @@ -208,7 +238,7 @@ +#endif /* HAVE_LIBRCC */ +} + -+void rccPatchSetContext(void *newctx) { ++void rccTaglibPatchSetContext(void *newctx) { +#ifdef HAVE_LIBRCC + if (newctx) { + ctx = (rcc_context)newctx; @@ -217,27 +247,37 @@ +#endif /* HAVE_LIBRCC */ +} + -+static void rccPatchTryInit() { ++static void rccTaglibPatchTryInit() { +#ifdef HAVE_LIBRCC + if (!rcc_initialized) { -+ rccPatchInit(); -+ if (rcc_initialized) atexit(rccPatchFree); ++ rccTaglibPatchInit(); ++ if (rcc_initialized) atexit(rccTaglibPatchFree); + } +#endif /* HAVE_LIBRCC */ +} + + -+TagLib::ByteVector rccPatchRecodeOutput(const std::string &s) { ++TagLib::ByteVector rccTaglibPatchRecodeOutput(const std::string &s) { + TagLib::ByteVector v; +#ifdef HAVE_LIBRCC + size_t rlen; + char *res; + -+ rccPatchTryInit(); ++ rccTaglibPatchTryInit(); + + res = rccSizedRecode(ctx, UTF_CLASS, OUT_CLASS, s.c_str(), s.length(), &rlen); ++#ifdef RCC_DEBUG ++ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) { ++ if (*c > 127) { ++ printf(" Output: %s - %s\n", s.c_str(), res?res:"null"); ++ break; ++ } ++ } ++#endif /* RCC_DEBUG */ ++ + if (res) v.setData(res, rlen); -+ else v.setData(s.c_str(), s.length()); ++ else v.setData("", 0); ++ //v.setData(s.c_str(), s.length()); + + return v; +#else @@ -247,17 +287,27 @@ +#endif /* HAVE_LIBRCC */ +} + -+TagLib::ByteVector rccPatchRecodeOutputID3(const std::string &s, bool v2 = false) { ++TagLib::ByteVector rccTaglibPatchRecodeOutputID3(const std::string &s, bool v2 = false) { + TagLib::ByteVector v; +#ifdef HAVE_LIBRCC + size_t rlen; + char *res; + -+ rccPatchTryInit(); ++ rccTaglibPatchTryInit(); + + res = rccSizedRecode(ctx, UTF_CLASS, v2?ID3V2_CLASS:ID3_CLASS, s.c_str(), s.length(), &rlen); ++#ifdef RCC_DEBUG ++ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) { ++ if (*c > 127) { ++ printf(" OutputID3(%i): %s - %s\n", v2, s.c_str(), res?res:"null"); ++ break; ++ } ++ } ++#endif /* RCC_DEBUG */ ++ + if (res) v.setData(res, rlen); -+ else v.setData(s.c_str(), s.length()); ++ else v.setData("", 0); ++ //v.setData(s.c_str(), s.length()); + + return v; +#else @@ -267,15 +317,24 @@ +#endif /* HAVE_LIBRCC */ +} + -+TagLib::ByteVector rccPatchRecodeInput(const std::string &s) { ++TagLib::ByteVector rccTaglibPatchRecodeInput(const std::string &s) { + TagLib::ByteVector v; +#ifdef HAVE_LIBRCC + size_t rlen; + char *res; + -+ rccPatchTryInit(); ++ rccTaglibPatchTryInit(); + + res = rccSizedRecode(ctx, OUT_CLASS, UTF_CLASS, s.c_str(), s.length(), &rlen); ++#ifdef RCC_DEBUG ++ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) { ++ if (*c > 127) { ++ printf(" Input: %s - %s\n", s.c_str(), res?res:"null"); ++ break; ++ } ++ } ++#endif /* RCC_DEBUG */ ++ + if (res) v.setData(res, rlen); + else +#endif /* HAVE_LIBRCC */ @@ -284,15 +343,23 @@ + return v; +} + -+TagLib::ByteVector rccPatchRecodeInputID3(const std::string &s, bool v2 = false) { ++TagLib::ByteVector rccTaglibPatchRecodeInputID3(const std::string &s, bool v2 = false) { + TagLib::ByteVector v; +#ifdef HAVE_LIBRCC + size_t rlen; + char *res; + -+ rccPatchTryInit(); ++ rccTaglibPatchTryInit(); + + res = rccSizedRecode(ctx, v2?ID3V2_CLASS:ID3_CLASS, UTF_CLASS, s.c_str(), s.length(), &rlen); ++#ifdef RCC_DEBUG ++ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) { ++ if (*c > 127) { ++ printf(" InputID3(%i): %s - %s\n", v2, s.c_str(), res?res:"null"); ++ break; ++ } ++ } ++#endif /* RCC_DEBUG */ + if (res) v.setData(res, rlen); + else +#endif /* HAVE_LIBRCC */ @@ -301,13 +368,12 @@ + return v; +} + -+TagLib::String::Type rccPatchGetLocaleType() { ++TagLib::String::Type rccTaglibPatchGetLocaleType() { +#ifdef HAVE_LIBRCC + size_t len; + char charset[32]; + -+ rccPatchTryInit(); -+ ++ rccTaglibPatchTryInit(); + if (!rccLocaleGetCharset(charset, NULL, 31)) { + if (!strncmp(charset, "UTF", 3)) { + len = strlen(charset); @@ -323,12 +389,12 @@ + return TagLib::String::UTF8; +} + -+TagLib::String::Type rccPatchGetID3Type() { ++TagLib::String::Type rccTaglibPatchGetID3Type() { +#ifdef HAVE_LIBRCC + size_t len; + const char *charset; + -+ rccPatchTryInit(); ++ rccTaglibPatchTryInit(); + + charset = rccGetCurrentCharsetName(ctx, ID3V2_CLASS); + if (charset) { @@ -341,13 +407,16 @@ + if (!strcmp(charset+(len-4),"16BE")) return TagLib::String::UTF16BE; + } + return TagLib::String::Latin1ID3V2; ++ } else { ++ // Error or no-language configured: If Latin1ID3V2 is returned we normally will use the default unicode encoding unless Latin1 is selected by taglib ++ return TagLib::String::Latin1ID3V2; + } +#endif /* HAVE_LIBRCC */ + return TagLib::String::Latin1; +} diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.h taglib-1.8-ds/taglib/toolkit/rccpatch.h --- taglib-1.8/taglib/toolkit/rccpatch.h 1970-01-01 01:00:00.000000000 +0100 -+++ taglib-1.8-ds/taglib/toolkit/rccpatch.h 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/taglib/toolkit/rccpatch.h 2013-04-24 17:44:12.000000000 +0200 @@ -0,0 +1,20 @@ +#ifndef _RCC_PATCH_H +#define _RCC_PATCH_H @@ -356,22 +425,22 @@ +#include "tstring.h" +#include "tbytevector.h" + -+void rccPatchFree(); -+void rccPatchInit(); -+void rccPatchSetContext(void *newctx); -+ -+TagLib::ByteVector rccPatchRecodeOutput(const std::string &s); -+TagLib::ByteVector rccPatchRecodeInput(const std::string &s); -+TagLib::ByteVector rccPatchRecodeOutputID3(const std::string &s, bool v2 = false); -+TagLib::ByteVector rccPatchRecodeInputID3(const std::string &s, bool v2 = false); ++void rccTaglibPatchFree(); ++void rccTaglibPatchInit(); ++void rccTaglibPatchSetContext(void *newctx); ++ ++TagLib::ByteVector rccTaglibPatchRecodeOutput(const std::string &s); ++TagLib::ByteVector rccTaglibPatchRecodeInput(const std::string &s); ++TagLib::ByteVector rccTaglibPatchRecodeOutputID3(const std::string &s, bool v2 = false); ++TagLib::ByteVector rccTaglibPatchRecodeInputID3(const std::string &s, bool v2 = false); + -+TagLib::String::Type rccPatchGetLocaleType(); -+TagLib::String::Type rccPatchGetID3Type(); ++TagLib::String::Type rccTaglibPatchGetLocaleType(); ++TagLib::String::Type rccTaglibPatchGetID3Type(); + +#endif /* _RCC_PATCH_H */ diff -dPNur taglib-1.8/taglib/toolkit/tstring.cpp taglib-1.8-ds/taglib/toolkit/tstring.cpp --- taglib-1.8/taglib/toolkit/tstring.cpp 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/taglib/toolkit/tstring.cpp 2013-01-29 12:46:14.000000000 +0100 ++++ taglib-1.8-ds/taglib/toolkit/tstring.cpp 2013-04-26 07:11:38.000000000 +0200 @@ -23,6 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ @@ -389,42 +458,59 @@ int length = 0; d->data.resize(v.size()); -@@ -397,10 +398,21 @@ +@@ -397,10 +398,38 @@ { ByteVector v; - switch(t) { -+ if (t == Locale) t = rccPatchGetLocaleType(); ++ if (t == Locale) { ++ // The source is either Unicode or real Latin1 (if rcc is bypassed) ++ std::string s = to8Bit(true); ++ ++ // In case of UTF8 locale, this probably will return NULL (no recoding needed), but we will take UTF8 path in the next swtich ++ v = rccTaglibPatchRecodeOutput(s); ++ if (v.size()) return v; ++ t = rccTaglibPatchGetLocaleType(); ++ } ++ + switch(t) { -+ case Locale: - case Latin1: + case Latin1ID3: + case Latin1ID3V2: - { ++ { + std::string s = to8Bit(true); -+ if (t == Latin1ID3) v = rccPatchRecodeOutputID3(s, false); -+ else if (t == Latin1ID3V2) v = rccPatchRecodeOutputID3(s, true); -+ else /* if (t == Latin1(Locale) */ v = rccPatchRecodeOutput(s); -+ -+ if (v.size()) return v; ++ if (t == Latin1ID3) v = rccTaglibPatchRecodeOutputID3(s, false); ++ else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeOutputID3(s, true); ++ if (v.size()) break; + ++ // we don't know if we got NULL because rcc is disabled (error) or UTF8 output is required ++ if ((t == Latin1ID3V2)&&(rccTaglibPatchGetID3Type() == UTF8)) { ++ v.setData(s.c_str(), s.length()); ++ } else { ++ for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) ++ v.append(char(*it)); ++ } ++ break; ++ } + case Latin1: + { ++ // We can have the UTF16 inside, but first 256 positions is equal to Latin1 for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) v.append(char(*it)); break; -@@ -750,6 +762,30 @@ +@@ -750,6 +779,34 @@ void String::prepare(Type t) { -+ if (t == Locale) t = rccPatchGetLocaleType(); ++ if (t == Locale) t = rccTaglibPatchGetLocaleType(); + + if ((t == Latin1)||(t == Latin1ID3)||(t == Latin1ID3V2)) { + std::string s = to8Bit(false); + ByteVector v; + -+ if (t == Latin1ID3) v = rccPatchRecodeInputID3(s, false); -+ else if (t == Latin1ID3V2) v = rccPatchRecodeInputID3(s, true); -+ else /* Latin1 converted from Locale */ v = rccPatchRecodeInput(s); ++ if (t == Latin1ID3) v = rccTaglibPatchRecodeInputID3(s, false); ++ else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(s, true); ++ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(s); + + if (v.size()) { + int length = 0; @@ -437,13 +523,17 @@ + } + d->data.resize(length); + t = UTF8; ++ } else { ++ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed, ++ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8 ++ //if (Unicode::isLegalUTF8(s)) t = UTF8; + } + } + switch(t) { case UTF16: { -@@ -839,6 +875,27 @@ +@@ -839,6 +896,27 @@ std::ostream &operator<<(std::ostream &s, const String &str) { @@ -459,8 +549,8 @@ +}; + +String::Type String::ID3WType(Type type) { -+ Type rcc_type = rccPatchGetID3Type(); -+ if ((rcc_type == Latin1ID3)||(rcc_type == Latin1ID3V2)) { ++ Type rcc_type = rccTaglibPatchGetID3Type(); ++ if ((rcc_type == Latin1ID3)||(rcc_type == Latin1ID3V2)||(rcc_type == Latin1)) { + if (type == Latin1) return rcc_type; + return type; + } @@ -474,7 +564,7 @@ +} diff -dPNur taglib-1.8/taglib/toolkit/tstring.h taglib-1.8-ds/taglib/toolkit/tstring.h --- taglib-1.8/taglib/toolkit/tstring.h 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8-ds/taglib/toolkit/tstring.h 2013-01-29 12:45:48.000000000 +0100 ++++ taglib-1.8-ds/taglib/toolkit/tstring.h 2013-04-24 17:44:12.000000000 +0200 @@ -90,6 +90,18 @@ */ enum Type { ++++++ taglib-1.8-strip-rpath.patch ++++++ Index: examples/CMakeLists.txt =================================================================== --- examples/CMakeLists.txt.orig 2012-09-06 20:03:15.000000000 +0200 +++ examples/CMakeLists.txt 2013-04-23 08:44:33.938480393 +0200 @@ -11,6 +11,8 @@ if(ENABLE_STATIC) add_definitions(-DTAGLIB_STATIC) endif(ENABLE_STATIC) +SET(CMAKE_SKIP_BUILD_RPATH TRUE) + ########### next target ############### ADD_EXECUTABLE(tagreader tagreader.cpp) @@ -45,6 +47,14 @@ ADD_EXECUTABLE(strip-id3v1 strip-id3v1.c TARGET_LINK_LIBRARIES(strip-id3v1 tag ) +#set_target_properties(examples PROPERTIES +# INSTALL_NAME_DIR ${BIN_INSTALL_DIR} +# LINK_INTERFACE_LIBRARIES "" +#) + +#install(TARGETS examples +# FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} +# RUNTIME DESTINATION ${BIN_INSTALL_DIR} +#) endif(BUILD_EXAMPLES) - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-ruby_parser for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package rubygem-ruby_parser for openSUSE:Factory checked in at 2013-04-29 09:59:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ruby_parser (Old) and /work/SRC/openSUSE:Factory/.rubygem-ruby_parser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ruby_parser", Maintainer is "ruby-devel(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-ruby_parser/rubygem-ruby_parser.changes 2013-03-28 13:26:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-ruby_parser.new/rubygem-ruby_parser.changes 2013-04-29 09:59:04.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Apr 20 15:47:11 UTC 2013 - coolo(a)suse.com + +- updated to version 3.1.3 +* 2 bug fixes: + + * Fixed begin w/ else but no rescue. (whitequark) + * Removed literal stripping from block_append. Not its job. + +------------------------------------------------------------------- Old: ---- ruby_parser-3.1.2.gem New: ---- ruby_parser-3.1.3.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ruby_parser.spec ++++++ --- /var/tmp/diff_new_pack.eAhbZM/_old 2013-04-29 09:59:05.000000000 +0200 +++ /var/tmp/diff_new_pack.eAhbZM/_new 2013-04-29 09:59:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: rubygem-ruby_parser -Version: 3.1.2 +Version: 3.1.3 Release: 0 %define mod_name ruby_parser %define mod_full_name %{mod_name}-%{version} @@ -30,7 +30,7 @@ Summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing License: MIT Group: Development/Languages/Ruby -%define mod_branch -3.1.2 +%define mod_branch -3.1.3 %define mod_weight 3 PreReq: update-alternatives -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-highline for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package rubygem-highline for openSUSE:Factory checked in at 2013-04-29 09:56:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-highline (Old) and /work/SRC/openSUSE:Factory/.rubygem-highline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-highline", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-highline/rubygem-highline.changes 2013-03-21 22:14:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-highline.new/rubygem-highline.changes 2013-04-29 09:56:39.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 20 15:48:31 UTC 2013 - coolo(a)suse.com + +- updated to version 1.6.18 + * Fixed a long supported interface that was accidentally broken with a recent change (by Rubem Nakamura Carneiro). + * Added encoding support to menus (by David Lyons). + * Some minor fixes to SystemExtensions (by whiteleaf and presidentbeef). + +------------------------------------------------------------------- Old: ---- highline-1.6.16.gem New: ---- highline-1.6.18.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-highline.spec ++++++ --- /var/tmp/diff_new_pack.d3Cy3k/_old 2013-04-29 09:56:40.000000000 +0200 +++ /var/tmp/diff_new_pack.d3Cy3k/_new 2013-04-29 09:56:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: rubygem-highline -Version: 1.6.16 +Version: 1.6.18 Release: 0 %define mod_name highline %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-gem2rpm for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package rubygem-gem2rpm for openSUSE:Factory checked in at 2013-04-29 09:56:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-gem2rpm (Old) and /work/SRC/openSUSE:Factory/.rubygem-gem2rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-gem2rpm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-gem2rpm/rubygem-gem2rpm.changes 2013-03-20 09:54:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-gem2rpm.new/rubygem-gem2rpm.changes 2013-04-29 09:56:32.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Apr 28 06:55:08 UTC 2013 - coolo(a)suse.com + +- support ruby 2.0 + +------------------------------------------------------------------- +Sat Apr 27 16:09:07 UTC 2013 - coolo(a)suse.com + +- update to 0.9.2 - no changelog + +------------------------------------------------------------------- +Mon Apr 22 19:03:01 UTC 2013 - mrueckert(a)suse.de + +- fix redirection in gem2rpm-opensuse + +------------------------------------------------------------------- Old: ---- gem2rpm-0.8.4.gem New: ---- gem2rpm-0.9.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-gem2rpm.spec ++++++ --- /var/tmp/diff_new_pack.JYweLL/_old 2013-04-29 09:56:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JYweLL/_new 2013-04-29 09:56:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: rubygem-gem2rpm -Version: 0.8.4 +Version: 0.9.2 Release: 0 %define mod_name gem2rpm %define mod_full_name %{mod_name}-%{version} @@ -34,6 +34,9 @@ Summary: Generate rpm specfiles from gems License: GPL-2.0+ Group: Development/Languages/Ruby +%define mod_branch -%{version} +%define mod_weight 9 +PreReq: update-alternatives %description Generate source rpms and rpm spec files from a Ruby Gem. @@ -57,12 +60,24 @@ %gem_build %install -%gem_install +%gem_install -f %{__install} -D -m 0755 %{S:2} %{buildroot}%{_bindir}/gem2rpm-opensuse +mv %{buildroot}%{_bindir}/gem2rpm{,%{mod_branch}} +ln -s gem2rpm%{mod_branch} %{buildroot}%{_bindir}/gem2rpm + +%post +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm gem2rpm %{_bindir}/gem2rpm%{mod_branch} %{mod_weight} + +%preun +if [ "$1" = 0 ] ; then + /usr/sbin/update-alternatives --remove gem2rpm %{_bindir}/gem2rpm%{mod_branch} +fi %files %defattr(-,root,root,-) -%{_bindir}/gem2rpm +%{_bindir}/gem2rpm%{mod_branch} +%ghost %{_bindir}/gem2rpm %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ %{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec ++++++ gem2rpm-fix-opensuse-template.diff ++++++ --- /var/tmp/diff_new_pack.JYweLL/_old 2013-04-29 09:56:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JYweLL/_new 2013-04-29 09:56:33.000000000 +0200 @@ -1,7 +1,7 @@ -diff -ru gem2rpm-0.8.4.orig/bin/gem2rpm gem2rpm-0.8.4/bin/gem2rpm ---- gem2rpm-0.8.4.orig/bin/gem2rpm 2013-03-18 14:10:53.897635829 +0100 -+++ gem2rpm-0.8.4/bin/gem2rpm 2013-03-18 14:11:06.853676714 +0100 -@@ -122,9 +122,15 @@ +diff -ru gem2rpm-0.9.2.orig/bin/gem2rpm gem2rpm-0.9.2/bin/gem2rpm +--- gem2rpm-0.9.2.orig/bin/gem2rpm 2013-04-27 18:05:35.507339324 +0200 ++++ gem2rpm-0.9.2/bin/gem2rpm 2013-04-27 18:06:04.661974841 +0200 +@@ -121,9 +121,15 @@ if output_file.nil? Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage) unless deps else @@ -18,10 +18,10 @@ ensure out.close() end -Nur in gem2rpm-0.8.4/bin: gem2rpm.orig. -diff -ru gem2rpm-0.8.4.orig/lib/gem2rpm/specification.rb gem2rpm-0.8.4/lib/gem2rpm/specification.rb ---- gem2rpm-0.8.4.orig/lib/gem2rpm/specification.rb 2013-03-18 14:10:53.897635829 +0100 -+++ gem2rpm-0.8.4/lib/gem2rpm/specification.rb 2013-03-18 14:11:06.852676700 +0100 +Only in gem2rpm-0.9.2/bin: gem2rpm.orig +diff -ru gem2rpm-0.9.2.orig/lib/gem2rpm/specification.rb gem2rpm-0.9.2/lib/gem2rpm/specification.rb +--- gem2rpm-0.9.2.orig/lib/gem2rpm/specification.rb 2013-04-27 18:05:35.561338649 +0200 ++++ gem2rpm-0.9.2/lib/gem2rpm/specification.rb 2013-04-27 18:06:04.661974841 +0200 @@ -6,7 +6,11 @@ class Specification < SimpleDelegator # A long description of gem wrapped to 78 characters. @@ -53,28 +53,31 @@ # List of dependencies that are used for development. def development_dependencies super.map {|d| Gem2Rpm::Dependency.new d} -diff -ru gem2rpm-0.8.4.orig/lib/gem2rpm.rb gem2rpm-0.8.4/lib/gem2rpm.rb ---- gem2rpm-0.8.4.orig/lib/gem2rpm.rb 2013-03-18 14:10:53.897635829 +0100 -+++ gem2rpm-0.8.4/lib/gem2rpm.rb 2013-03-18 14:11:06.853676714 +0100 -@@ -35,11 +35,13 @@ +diff -ru gem2rpm-0.9.2.orig/lib/gem2rpm.rb gem2rpm-0.9.2/lib/gem2rpm.rb +--- gem2rpm-0.9.2.orig/lib/gem2rpm.rb 2013-04-27 18:05:35.507339324 +0200 ++++ gem2rpm-0.9.2/lib/gem2rpm.rb 2013-04-27 18:08:10.485401832 +0200 +@@ -31,11 +31,14 @@ end def Gem2Rpm.convert(fname, template=TEMPLATE, out=$stdout, - nongem=true, local=false, doc_subpackage = true) + nongem=true, local=false, doc_subpackage = true, oldlicense=nil) - format = Gem::Format.from_file_by_path(fname) - spec = Gem2Rpm::Specification.new(format.spec) + package = Gem2Rpm::Package.new(fname) + format = Gem2Rpm::Format.new(package) + spec = Gem2Rpm::Specification.new(package.spec) - spec.description ||= spec.summary - download_path = "" ++ #spec.description ||= spec.summary + if spec.licenses.empty? && oldlicense + spec.licenses = oldlicense.split(' and ') + end + download_path = "" unless local begin - download_path = find_download_url(spec.name, spec.version) -diff -ru gem2rpm-0.8.4.orig/templates/opensuse.spec.erb gem2rpm-0.8.4/templates/opensuse.spec.erb ---- gem2rpm-0.8.4.orig/templates/opensuse.spec.erb 2013-03-18 14:10:53.897635829 +0100 -+++ gem2rpm-0.8.4/templates/opensuse.spec.erb 2013-03-18 14:11:53.478824020 +0100 +Only in gem2rpm-0.9.2/lib: gem2rpm.rb.orig +Only in gem2rpm-0.9.2/lib: gem2rpm.rb.rej +diff -ru gem2rpm-0.9.2.orig/templates/opensuse.spec.erb gem2rpm-0.9.2/templates/opensuse.spec.erb +--- gem2rpm-0.9.2.orig/templates/opensuse.spec.erb 2013-04-27 18:05:35.561338649 +0200 ++++ gem2rpm-0.9.2/templates/opensuse.spec.erb 2013-04-28 09:10:52.287772175 +0200 @@ -1,7 +1,7 @@ # -# spec file for package rubygem-<%= spec.name %> (Version <%= spec.version %>) @@ -85,7 +88,7 @@ # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -@@ -15,58 +15,106 @@ +@@ -15,58 +15,142 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -115,9 +118,9 @@ +<% unless req.empty? -%> +Requires: ruby <%= req %> +BuildRequires: ruby-devel <%= req %> ++<% end -%> <% end -%> -<% for d in spec.dependencies -%> -+<% end -%> +<% for d in spec.runtime_dependencies -%> +<% if ['rdoc'].include? d.name.to_s -%> +# <%= d.name %> <%= d.__getobj__().requirement %> @@ -146,6 +149,11 @@ +License: CHECK(Ruby) +<% end -%> +Group: Development/Languages/Ruby ++<% unless spec.executables.empty? -%> ++%define mod_branch -%{version} ++%define mod_weight <%= spec.version.to_s.split('.')[0] %> ++PreReq: update-alternatives ++<% end -%> + %description -<%= spec.description %> @@ -156,13 +164,24 @@ +Summary: RDoc documentation for %{mod_name} +Group: Development/Languages/Ruby +Requires: %{name} = %{version} -+ + +%description doc +Documentation generated at gem installation time. +Usually in RDoc and RI formats. - ++ +<% end -%> -+<% test_frameworks = %w(test spec).select { |framework| format.file_entries.any? { |entry, data| path = entry['path'] ; path.index(framework + "/") == 0 } } -%> ++<% test_frameworks = %w(test spec).select do |framework| ++ format.file_entries.any? do |entry| ++ # new rubygems version has it different ++ if entry.kind_of?(Array) ++ path=entry[0]['path'] ++ else ++ path=entry ++ end ++ path.index(framework + "/") == 0 ++ end ++ end ++-%> +<% unless test_frameworks.empty? -%> +%package testsuite +Summary: Test suite for %{mod_name} @@ -187,21 +206,41 @@ +<% unless spec.extensions.empty? -%> %gem_cleanup -<% end %> -- ++<% end -%> ++<% spec.executables.each do |executable| -%> ++mv %{buildroot}%{_bindir}/<%= executable %>{,%{mod_branch}} ++ln -s <%= executable %>%{mod_branch} %{buildroot}%{_bindir}/<%= executable %> ++<%end -%> ++<% unless spec.executables.empty? -%> ++ ++%post ++<% spec.executables.each do |executable| -%> ++/usr/sbin/update-alternatives --install \ ++ %{_bindir}/<%= executable %> <%= executable %> %{_bindir}/<%= executable %>%{mod_branch} %{mod_weight} ++<% end -%> + -%clean -%{__rm} -rf %{buildroot} ++%preun ++<% spec.executables.each do |executable| -%> ++if [ "$1" = 0 ] ; then ++ /usr/sbin/update-alternatives --remove <%= executable %> %{_bindir}/<%= executable %>%{mod_branch} ++fi ++<% end -%> +<% end -%> %files %defattr(-,root,root,-) -<% spec.executables.each do |executable| %> -+<% spec.executables.each do |executable| -%> - %{_bindir}/<%= executable %> +-%{_bindir}/<%= executable %> -<% end %> -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_name}-%{version}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/ -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/ ++<% spec.executables.each do |executable| -%> ++%{_bindir}/<%= executable %>%{mod_branch} ++%ghost %{_bindir}/<%= executable %> +<% end -%> +%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem +%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ ++++++ gem2rpm-opensuse ++++++ --- /var/tmp/diff_new_pack.JYweLL/_old 2013-04-29 09:56:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JYweLL/_new 2013-04-29 09:56:33.000000000 +0200 @@ -1,3 +1,3 @@ #!/bin/sh -echo "obsolete, gem2rpm knows it's running on opensuse" > &2 +echo "obsolete, gem2rpm knows it's running on opensuse" >&2 exec gem2rpm -t opensuse $1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit roundcubemail for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2013-04-29 09:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old) and /work/SRC/openSUSE:Factory/.roundcubemail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "roundcubemail", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes 2013-04-02 12:55:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes 2013-04-29 09:54:51.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Apr 27 09:31:24 UTC 2013 - wr(a)rosenauer.org + +- Update to version 0.9.0 + * Improved rendering of forwarded and attached messages + * Optionally display and compose email messages a new windows + * Unified UI for message view and composition + * Show sender photos from contacts in email view + * Render thumbnails for image attachments + * Download all attachments as zip archive (using the zipdownload plugin) + * Forward multiple emails as attachments + * CSV import for contacts + +------------------------------------------------------------------- Old: ---- roundcubemail-0.8.6.tar.gz New: ---- roundcubemail-0.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ roundcubemail.spec ++++++ --- /var/tmp/diff_new_pack.4itLbH/_old 2013-04-29 09:54:53.000000000 +0200 +++ /var/tmp/diff_new_pack.4itLbH/_new 2013-04-29 09:54:53.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause Group: Productivity/Networking/Email/Clients Url: http://www.roundcube.net/ -Version: 0.8.6 +Version: 0.9.0 Release: 0 BuildRequires: apache2-devel %if 0%{suse_version} >= 1100 ++++++ roundcubemail-0.8.6.tar.gz -> roundcubemail-0.9.0.tar.gz ++++++ ++++ 238574 lines of diff (skipped) ++++++ roundcubemail-config-dir.patch ++++++ --- /var/tmp/diff_new_pack.4itLbH/_old 2013-04-29 09:54:54.000000000 +0200 +++ /var/tmp/diff_new_pack.4itLbH/_new 2013-04-29 09:54:54.000000000 +0200 @@ -1,26 +1,26 @@ diff --git a/installer/index.php b/installer/index.php -index 4c94fea..204cdf4 100644 +index 0e80b1c..0123a70 100644 --- a/installer/index.php +++ b/installer/index.php -@@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE); - ini_set('display_errors', 1); +@@ -41,7 +41,7 @@ ini_set('display_errors', 1); define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); --define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); - define('RCMAIL_CHARSET', 'UTF-8'); + define('RCUBE_INSTALL_PATH', INSTALL_PATH); +-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); ++define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; + $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; diff --git a/program/include/iniset.php b/program/include/iniset.php -index 3809479..5004448 100644 +index c2efe01..2cccf74 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php -@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) { +@@ -44,7 +44,7 @@ if (!defined('INSTALL_PATH')) { } if (!defined('RCMAIL_CONFIG_DIR')) { - define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); ++ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail/'); } - // make sure path_separator is defined + if (!defined('RCUBE_LOCALIZATION_DIR')) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pam for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package pam for openSUSE:Factory checked in at 2013-04-29 09:54:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam (Old) and /work/SRC/openSUSE:Factory/.pam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pam", Maintainer is "mc(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pam/pam.changes 2013-02-07 10:45:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pam.new/pam.changes 2013-04-29 09:54:43.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 26 10:25:06 UTC 2013 - mmeister(a)suse.com + +- Added libtool as BuildRequire, and autoreconf -i option to fix + build with new automake + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.88wHju/_old 2013-04-29 09:54:46.000000000 +0200 +++ /var/tmp/diff_new_pack.88wHju/_new 2013-04-29 09:54:46.000000000 +0200 @@ -32,6 +32,7 @@ %endif BuildRequires: autoconf BuildRequires: automake +BuildRequires: libtool %define libpam_so_version 0.83.1 %define libpam_misc_so_version 0.82.0 %define libpamc_so_version 0.82.1 @@ -107,7 +108,7 @@ %patch3 -p1 %build -autoreconf +autoreconf -i export CFLAGS="%optflags -DNDEBUG" %configure \ --sbindir=/sbin \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mythes for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package mythes for openSUSE:Factory checked in at 2013-04-29 09:54:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mythes (Old) and /work/SRC/openSUSE:Factory/.mythes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mythes", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mythes/mythes.changes 2012-12-20 11:02:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mythes.new/mythes.changes 2013-04-29 09:54:36.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 20 11:53:44 UTC 2013 - tchvatal(a)suse.com + +- Add downloadable URL. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mythes.spec ++++++ --- /var/tmp/diff_new_pack.btTBas/_old 2013-04-29 09:54:37.000000000 +0200 +++ /var/tmp/diff_new_pack.btTBas/_new 2013-04-29 09:54:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mythes # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -21,14 +21,14 @@ Name: mythes Version: 1.2.3 Release: 0 -License: BSD-2-Clause and MIT Summary: A simple thesaurus for Libreoffice -Url: http://hunspell.sourceforge.net/ +License: BSD-2-Clause and MIT Group: System/Libraries -Source0: %name-%version.tar.gz -BuildRequires: pkgconfig -BuildRequires: hunspell-devel +Url: http://hunspell.sourceforge.net/ +Source0: http://downloads.sourceforge.net/hunspell/%name-%version.tar.gz BuildRequires: gcc-c++ +BuildRequires: hunspell-devel +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0