May 2010 - openSUSE Commits - openSUSE Mailing Lists

commit gtranslator for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package gtranslator for openSUSE:Factory checked in at Wed May 5 23:43:44 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ gtranslator/gtranslator.changes 2010-02-22 10:05:25.000000000 +0100 @@ -0,0 +1,96 @@ +------------------------------------------------------------------- +Mon Feb 22 00:17:24 CET 2010 - vuntz(a)opensuse.org + +- Update to version 1.9.9: + + Add Profile quick selector + + Rewriting profile manager to use GtrProfileManager + + Converted GtrApplication into an UniqueAPP using libunique + + Misc bugfixes + + Updated translations. +- Add libunique-devel BuildRequires. + +------------------------------------------------------------------- +Thu Feb 11 00:23:22 CET 2010 - vuntz(a)opensuse.org + +- Update to version 1.9.8: + + Refactor methods and file names from gtranslator to gtr + + Modernize autotools configuration + + Added new tango icons and logo + + Removed Subversion plugin + + Misc Bugfixes + + Updated translations. +- Change group from Development/Tools to Development/Tools/Other to + fix rpmlint warning. + +------------------------------------------------------------------- +Sun Jan 31 23:48:22 CET 2010 - vuntz(a)opensuse.org + +- Update to version 1.9.7: + + Show percentage of translated messages + + Fixed several compiler warnings + + Update toolbar editor + + Make header inherit from GtranslatorMsg + + Ported gtranslator from MessageArea to GtkInfoBar + + Misc Bugfixes + + Updated translations. +- Remove renaming of sr@Latn locale to sr@latin. + +------------------------------------------------------------------- +Tue Aug 25 17:42:13 CEST 2009 - vuntz(a)novell.com + +- Update to version 1.9.6: + + Adapted gtranslator in order to work on Windows + + bgo#579775 - Fixed format string attack + + bgo#582430 - Added some header files + + bgo#555672 - Fixed CRITICAL: editor_create_item_from_name + + bgo#557096 - Fixed GtkSpinButton problem changing to GtkBuilder + + bgo#569061 - Displaying an error message before saving a read + only file + + bgo#569062 - Use a "standard" tabs menu instead of + Go->Next/Prev File + + bgo#569068 - Made more clear the message in the status bar + + bgo#571497 - Fixed crash on first-time startup with po-file as + argument + + bgo#575128 - Removed deprecated GTK+ symbols + + bgo#579775 - Fixed Format string attack danger + + bgo#582430 - Some of the header files weren't included in the + source code + + bgo#583961 - Fixed to build with gdl 2.27.2 + + bgo#584692 - Show the next message of the one you are editing + + bgo#591594 - Fixed problem that made Edit header only made + effect when you close gtranslator + + bgo#592210 - Removed duplicated define in configure.ac + + bgo#592214 - Fixed some gcc warnings + + bgo#592215 - Wrong arguments to + gtranslator_statusbar_flash_message() + + bgo#592226 - Fixed Error widget built wrongly + + bgo#592227 - Source code did not working due to a wrong widget + name + + bgo#569054 - Fixed empty line insertion before translator email + in header + + Updated translations. +- Drop gtranslator-gdl-2.27.patch and gtranslator-profile.patch: + fixed upstream. + + +------------------------------------------------------------------- +Thu Jun 11 03:35:47 CEST 2009 - vuntz(a)novell.com + +- Add gtranslator-gdl-2.27.patch to fix build with latest gdl. + +------------------------------------------------------------------- +Thu May 14 11:40:12 CEST 2009 - vuntz(a)novell.com + +- Update gtranslator-profile.patch to fix more build issues. +- Add BuildRequires for features: gnome-utils-devel, + gtkspell-devel, gucharmap-devel, libneon-devel, libsoup-devel, + subversion-devel +- Pass --disable-static, --with-gtkspell and --with-dictionary to + configure, and remove --enable-mime-bind and --with-gconf that + don't exist. +- Clean up file list a bit; do not ship help files twice. + +------------------------------------------------------------------- +Thu May 14 11:21:38 CEST 2009 - vuntz(a)novell.com + +- Initial package. calling whatdependson for head-i586 New: ---- gtranslator-1.9.9.tar.bz2 gtranslator.changes gtranslator.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtranslator.spec ++++++ # # spec file for package gtranslator (Version 1.9.9) # # Copyright (c) 2010 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/ # # norootforbuild Name: gtranslator Version: 1.9.9 Release: 1 License: GPLv2+ Summary: A GNOME po file editor with many bells and whistles Group: Development/Tools/Other Url: http://gtranslator.sourceforge.net Source: http://www.kabalak.net/gtranslator/download/releases/%{version}/%{name}-%{v… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gconf2-devel BuildRequires: gdl-devel BuildRequires: glib2-devel BuildRequires: gnome-utils-devel BuildRequires: gtk2-devel >= 2.16 BuildRequires: gtksourceview-devel BuildRequires: gtkspell-devel BuildRequires: gucharmap-devel BuildRequires: intltool BuildRequires: libdb-4_5-devel BuildRequires: libneon-devel BuildRequires: libsoup-devel BuildRequires: libunique-devel BuildRequires: libxml2-devel BuildRequires: subversion-devel BuildRequires: update-desktop-files %gconf_schemas_prereq %description gtranslator is a comfortable po file editor with many bells and whistles. It features many useful function which ease the work of translators of po files imminently. %package devel Summary: A GNOME po file editor with many bells and whistles Group: Development/Tools/Other License: GPLv2+ %description devel gtranslator is a comfortable po file editor with many bells and whistles. It features many useful function which ease the work of translators of po files imminently. %lang_package %prep %setup -q %build %configure \ --disable-static \ --disable-scrollkeeper \ --with-gtkspell \ --with-dictionary %{__make} %{?jobs:-j%jobs} %install %makeinstall %suse_update_desktop_file %{name} %find_gconf_schemas %find_lang %{name} %fdupes $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun %posttrans -f %{name}.schemas_posttrans %clean %{__rm} -rf %{buildroot} %files -f %{name}.schemas_list %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO %doc %{_mandir}/man?/* %{_bindir}/* %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/gtranslator.* %{_datadir}/pixmaps/%{name}/ %files devel %defattr(-, root, root) %{_includedir}/gtranslator-2.0 %{_libdir}/pkgconfig/gtranslator.pc %{_datadir}/gtk-doc/html/%{name} %files lang -f %{name}.lang %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at Wed May 5 23:42:20 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ mariadb/mariadb.changes 2010-04-30 14:29:25.000000000 +0200 @@ -0,0 +1,1610 @@ +------------------------------------------------------------------- +Mon Apr 26 10:34:41 CEST 2010 - mhrusecky(a)suse.cz + +- packaging MariaDB shared libraries to be used by client and tools + +------------------------------------------------------------------- +Wed Apr 7 10:26:52 CEST 2010 - mhrusecky(a)suse.cz + +- updated to MariaDB 5.1.44 + - changelog: + http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.44_Changelog + - release notes: + http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.44_Release_Notes + +------------------------------------------------------------------- +Wed Mar 17 17:44:37 UTC 2010 - mhrusecky(a)suse.cz + +- adapted to MariaDB 5.1.42 + - changelog: + http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.42_Changelog + - release notes: + http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.42_Release_Notes + +------------------------------------------------------------------- +Mon Mar 8 15:13:11 UTC 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.44, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-43.html + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-44.html +- splitting out shared libmysqld shared library (quick dirty way) +- preparing spec file to be more general and easily adjustable to + other MySQL flavours + +------------------------------------------------------------------- +Sun Jan 10 00:57:25 CET 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.42, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-38.html + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html + +------------------------------------------------------------------- +Tue Dec 15 01:23:16 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Tue Dec 1 17:52:18 CET 2009 - mhrusecky(a)suse.cz + +- removing compatibility symlink + - intended for 11.2 but never get there +- fixing various security issues (bnc#557669) + - upstream #47320 - checking server certificates (CVE-2009-4028) + - upstream #48291 - error handling in subqueries (CVE-2009-4019) + - upstream #47780 - preserving null_value flag in GeomFromWKB() + (CVE-2009-4019) + - upstream #39277 - symlink behaviour fixed (CVE-2008-7247) + - upstream #32167 - symlink behaviour refixed (CVE-2009-4030) + +------------------------------------------------------------------- +Wed Nov 11 14:23:43 CET 2009 - mhrusecky(a)suse.cz + +- making pid file readable by everybody +- fixing 'rcmysql status' for non-root + +------------------------------------------------------------------- +Thu Oct 29 14:11:09 CET 2009 - mhrusecky(a)suse.cz + +- adding /var/lib/mysql/mysql.sock symlink for compatibility with + applications for older versions +- using kill instead of killproc as killproc matches by default all + running MySQL instances (even KDE ones) +- checking for log consistency in rc script instead of post of spec + as it makes more sense + +------------------------------------------------------------------- +Fri Oct 16 09:32:35 UTC 2009 - adrian(a)suse.de + +- fix PreRequires or mysql package can't be used in build enviroment +- do not fail on usermod call in %pre as specified + +------------------------------------------------------------------- +Mon Oct 12 18:36:04 UTC 2009 - coolo(a)novell.com + +- fix prereq for usermod + +------------------------------------------------------------------- +Mon Oct 5 11:11:35 CEST 2009 - mhrusecky(a)suse.cz + +- fixed my.cnf rights (bnc#539249) +- fixed restart on update (bnc#520876) + +------------------------------------------------------------------- +Tue Sep 15 16:45:23 CEST 2009 - mhrusecky(a)suse.cz + +- Few better formulations in README.SuSE (bnc#539243) + +------------------------------------------------------------------- +Tue Aug 25 10:19:04 CEST 2009 - mhrusecky(a)suse.cz + +- Refixing bnc#420313 so mysql_config will return better values + +------------------------------------------------------------------- +Wed Aug 12 13:29:09 CEST 2009 - mhrusecky(a)suse.cz + +- Using configure option to enforce pthreads rwlocks on s390 instead + of sed substitution + +------------------------------------------------------------------- +Tue Jul 28 17:10:31 CEST 2009 - mhrusecky(a)suse.cz + +- Applying upstream patch for upstream bug#43594 + (hotcopy will ignore log tables) (bnc#525325) +- Not using bmove512 as it may slow things down + (see upstream bug#19975) + +------------------------------------------------------------------- +Mon Jul 27 14:45:24 CEST 2009 - mhrusecky(a)suse.cz + +- Applying upstream patch for upstream bug#36259 + 'Optimizing with ORDER BY' + +------------------------------------------------------------------- +Fri Jul 24 17:35:07 CEST 2009 - dmueller(a)suse.de + +- fix baselibs.conf (bnc#525065) + +------------------------------------------------------------------- +Tue Jul 7 11:19:05 CEST 2009 - mhrusecky(a)suse.cz + +- updated to 5.1.36, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html + +------------------------------------------------------------------- +Fri Jun 26 11:09:34 CEST 2009 - mhrusecky(a)suse.cz + +- fixed rcmysql status + +------------------------------------------------------------------- +Tue Jun 23 19:33:08 CEST 2009 - mhrusecky(a)suse.cz + +- extra escaping in rc script just to be sure +- creating parent directories for logs when they don't exists +- rc script didn't always exited when it should +- checking for incompatible databases in way it can be logged + +------------------------------------------------------------------- +Fri Jun 19 13:17:44 CEST 2009 - mhrusecky(a)suse.cz + +- actualized README.SuSE + +------------------------------------------------------------------- +Tue Jun 16 14:32:00 CEST 2009 - mhrusecky(a)suse.cz + +- updated to 5.1.35, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html +- fixed some tests + +------------------------------------------------------------------- +Mon Jun 8 13:33:35 CEST 2009 - mhrusecky(a)suse.cz + +- putting all log files to subdirectory in /var/log + +------------------------------------------------------------------- +Mon Jun 1 18:33:43 CEST 2009 - mhrusecky(a)suse.cz + +- moving socket back to /var/lib/mysql for people with old distributions + +------------------------------------------------------------------- +Sat May 2 13:43:40 CEST 2009 - chris(a)computersalat.de + +- fdupes fix for fedora + +------------------------------------------------------------------- +Fri May 1 17:55:12 CEST 2009 - chris(a)computersalat.de + +- beautify spec file + o some if's to get Fedora, Centos build +- to minimize effort for admins + o with-charset=utf8 + o with-collation=utf8_unicode_ci + +------------------------------------------------------------------- +Thu Apr 30 10:58:29 CEST 2009 - mhrusecky(a)suse.cz + +- adding upgrade log + +------------------------------------------------------------------- +Tue Apr 28 18:33:22 CEST 2009 - mhrusecky(a)suse.cz + +- fixed update so only one at the time is allowed + +------------------------------------------------------------------- +Fri Apr 24 17:27:11 CEST 2009 - mhrusecky(a)suse.cz ++++ 1413 more lines (skipped) ++++ between /dev/null ++++ and mariadb/mariadb.changes calling whatdependson for head-i586 New: ---- README.SuSE README.debug abi_test.patch baselibs.conf libmysql-no-pkglibdir.patch mariadb-5.1.44.tar.bz2 mariadb.changes mariadb.spec mysql-5.1.31-shebang.patch mysql-5.1.33-safe-process-in-bin.patch mysql-5.1.33-scripts-paths.patch mysql-5.1.33-ssl-lib64-macro.patch mysql-5.1.35-test-utf8.patch mysql-5.1.35-test-variables-big.patch mysql-5.1.36-bmove512.patch mysql-5.1.36-hotcopy.patch mysql-5.1.42-myslq-test.patch mysql-cnf.patch mysql-enable-plugins.patch mysql-group.patch mysql-install_db-quiet.patch mysql-logrotate.patch mysql-multi-configuration.patch mysql-plugins-avoid-version.patch mysql.SuSEfirewall2 mysql_config.patch mysql_upgrade-exit-status.patch mysqld_multi.patch rc.mysql-multi suse-test-run ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ ++++ 972 lines (skipped) ++++++ README.SuSE ++++++ Notes about MySQL 5.1 package: ============================== With MySQL 5.1 package we introduced some changes you may like to know. Most of them will affect you only if you are upgrading from previous version and you did some changes to your configuration. 1) Plugins: =========== One of the new features in MySQL 5.1 is support for plugins. So some of the storage engines are now shipped like that. You can use following plugins: - archive - blackhole - federated - example InnoDB is still compiled as internal part of MySQL. If you are upgrading from version 5.0 or if this is your first installation of MySQL 5.1, all plugins will be enabled by default and you can disable them manually later (see http://dev.mysql.com/doc/refman/5.1/en/uninstall-plugin.html). With this change you need to remove skip-federated option from your my.cnf file if you have changed it manually. This option was there by default in previous versions of MySQL. 2) File locations: ================== There were some changes in files locations. Most of them were made in the default configuration file so if you are experiencing problems and you have made some manual adjustments to your /etc/my.cnf, try to merge this file with /etc/my.cnf.rpmnew. File locations changes: - MySQL socket file and pid file were moved from /var/lib/mysql to more reasonable location ( /var/run/mysql ) by default. - MySQL log files are in /var/log/mysql. 3) BerkeleyDB: ============== MySQL no longer contains BerkeleyDB as storage engine. There is no fix for that and if you used it before, you have to migrate your data to different storage engine BEFORE updating. This can be done for example using following command: ALTER TABLE foo ENGINE = INNODB; 4) MySQL Upgrade Log ==================== If you missed messages displayed during automatic MySQL database upgrade, you can find them from now on in /var/log/mysql/mysqld-upgrade.log ++++++ README.debug ++++++ Debugging mysqld crashes ======================== Author: Michal Marek <mmarek(a)suse.cz> Last modified: 2006-07-31 Contents -------- 1) Query log 2) Coredumps and Backtraces 3) Trace files In case your MySQL server crashes, here are some hints on what to include in a bugreport at https://bugzilla.novell.com/ . Please report there only bugs in the MySQL packages packaged by Novell/SUSE, bugs in binaries / source provided by MySQL AB should be reported at http://bugs.mysql.com/ . 1) Query log ------------ Note: Skip this chapter if you already have an exact query that crashes the server To find out which query possibly crashed the server, add the following line to your /etc/my.cnf into section [mysqld]: log=/var/lib/mysql/mysqld-query.log Mysqld then will, at some performance cost, log all queries into this file. After a server crash, you can examine the queries from the time it crashed and try to reproduce the crash with single queries (this might not allways work, eg. if the crash is caused by some race condition). Note that this log file may become extremly large, so if you decide to attach it whole to the bugzilla, don't forget to bzip2 -k /var/lib/mysql/mysqld-query.log and attach the bzipped file instead. 2) Coredumps and Backtraces --------------------------- Another valuable information for the developers is the backtrace. The easies way to get one is to let mysqld produce a coredump. Add the following line to your /etc/my.cnf into section [mysqld]: core-file Note: this unfortunatelly doesn't work in SUSE Linux 10.1 and older. On these systems, you need to run safe_mysqld directly under user mysql: su - mysql mysqld_safe --socket=/var/lib/mysql/mysql.sock \ --datadir=/var/lib/mysql --core-file & The core file will be written to the /var/lib/mysql/ directory. I suggest setting the kernel variable kernel.core_uses_pid to 1 sysctl -w kernel.core_uses_pid=1 so that the coredumps don't overwrite each other if you experience multiple crashes. After you got the core file, install the gdb and mysql-debuginfo packages and run gdb /usr/sbin/mysqld /var/lib/mysql/core (gdb) bt Replace mysqld with the mysqld version you used (mysqld, mysqld-max or mysqld-debug) and core with the actual name of the coredump. 3) Trace files -------------- You'll need the mysqld-debug binary from the mysql-debug package to get a trace file. Install the mysqld-debug package and the start mysqld using following command: $ MYSQLD_DEBUG=yes rcmysql start Note: The init script doesn't automatically pick up the mysqld-debug binary (as it does with mysqld-max), because it is expected to be used just temporarily to help solving a particular problem. The init script will then start mysqld-debug and add the --core-file, --log and --debug options for you. The query log will be stored in /var/lib/mysql/myqld-query.log and the trace file in /var/lib/mysql/mysqld.trace If you don't like the options set by the init script, just put your own into /etc/my.cnf and the init script will honor it. For information about the --debug option, see "The DBUG Package": http://dev.mysql.com/doc/refman/5.0/en/the-dbug-package.html . The trace file will contain various debug information and function calls/returns and will become _extremly_ huge after a while, so don't attach it to bugzilla unless requested. ++++++ abi_test.patch ++++++ diff -Naru mysql-5.1.44-bak/include/mysql.h mysql-5.1.44/include/mysql.h --- mysql-5.1.44-bak/include/mysql.h 2010-02-23 00:31:19.000000000 +0100 +++ mysql-5.1.44/include/mysql.h 2010-02-23 10:51:49.000000000 +0100 @@ -44,7 +44,9 @@ #endif #ifndef _global_h /* If not standard header */ -#include <sys/types.h> +#ifndef _abi_test_ +#include <sys/types.h> +#endif #ifdef __LCC__ #include <winsock2.h> /* For windows */ #endif diff -Naru mysql-5.1.44-bak/include/mysql.h.pp mysql-5.1.44/include/mysql.h.pp --- mysql-5.1.44-bak/include/mysql.h.pp 2010-02-23 00:31:19.000000000 +0100 +++ mysql-5.1.44/include/mysql.h.pp 2010-02-23 10:54:46.000000000 +0100 @@ -1,4 +1,3 @@ -#include <sys/types.h> typedef char my_bool; typedef int my_socket; #include "mysql_version.h" diff -Naru mysql-5.1.44-bak/Makefile.am mysql-5.1.44/Makefile.am --- mysql-5.1.44-bak/Makefile.am 2010-02-23 00:31:18.000000000 +0100 +++ mysql-5.1.44/Makefile.am 2010-02-23 10:50:18.000000000 +0100 @@ -321,7 +321,8 @@ -I$(top_builddir)/include \ -I$(top_builddir)/include/mysql \ -I$(top_builddir)/sql \ - $$file 2>/dev/null | \ + -D_abi_test_ \ + $$file | \ @SED@ -e '/^# /d' \ -e '/^[ ]*$$/d' \ -e '/^#pragma GCC set_debug_pwd/d' \ ++++++ baselibs.conf ++++++ libmysqlclient16 libmysqlclient_r16 ++++++ libmysql-no-pkglibdir.patch ++++++ --- libmysql/Makefile.shared | 2 +- libmysqld/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- libmysql/Makefile.shared.orig +++ libmysql/Makefile.shared @@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix) ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded ## until someone complains that they need separate options. LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) -pkglib_LTLIBRARIES = $(target) +lib_LTLIBRARIES = $(target) noinst_PROGRAMS = conf_to_src --- libmysqld/Makefile.am.orig +++ libmysqld/Makefile.am @@ -36,7 +36,7 @@ INCLUDES= -I$(top_builddir)/include -I$ @condition_dependent_plugin_includes@ noinst_LIBRARIES = libmysqld_int.a -pkglib_LIBRARIES = libmysqld.a +lib_LIBRARIES = libmysqld.a SUBDIRS = . examples libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ ++++++ mysql-5.1.31-shebang.patch ++++++ diff -Naru mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh --- mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100 +++ mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh 2009-02-24 17:57:42.000000000 +0100 @@ -1,3 +1,4 @@ +#!/bin/sh d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789" test -d "$d" || mkdir "$d" rm -f "$d"/* diff -Naru mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh --- mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100 +++ mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-24 17:58:12.000000000 +0100 @@ -1,3 +1,4 @@ +#!/bin/sh # This test requires a non-lowercase tmpdir directory on a case-sensitive # filesystem. diff -Naru mysql-5.1.31-bak/sql-bench/graph-compare-results.sh mysql-5.1.31/sql-bench/graph-compare-results.sh --- mysql-5.1.31-bak/sql-bench/graph-compare-results.sh 2009-02-23 17:18:49.000000000 +0100 +++ mysql-5.1.31/sql-bench/graph-compare-results.sh 2009-02-24 18:00:16.000000000 +0100 @@ -1,3 +1,4 @@ +#/usr/bin/perl #### #### Hello ... this is a heavily hacked script by Luuk #### instead of printing the result it makes a nice gif ++++++ mysql-5.1.33-safe-process-in-bin.patch ++++++ --- mysql-test/lib/My/SafeProcess.pm 2009-04-03 15:14:38.000000000 +0200 +++ mysql-test/lib/My/SafeProcess.pm 2009-03-13 22:49:26.000000000 +0100 @@ -86,7 +86,7 @@ my $safe_kill; if (IS_WIN32PERL or IS_CYGWIN){ # Use my_safe_process.exe + my $exe= my_find_bin(".", ["../../bin","lib/My/SafeProcess", "My/SafeProcess"], - my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], "my_safe_process"); push(@safe_process_cmd, $exe); @@ -96,7 +96,7 @@ else { # Use my_safe_process + my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], "my_safe_process"); push(@safe_process_cmd, $exe); } ++++++ mysql-5.1.33-scripts-paths.patch ++++++ --- scripts/Makefile.am 2009-04-02 18:29:00.292563355 +0200 +++ scripts/Makefile.am 2009-04-02 18:21:50.462559739 +0200 @@ -110,7 +110,7 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ mysql_system_tables_fix.sql @echo "Building $@"; - @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ + @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ # # Build mysql_fix_privilege_tables_sql.c from @@ -123,7 +123,7 @@ sleep 2 $(top_builddir)/scripts/comp_sql$(EXEEXT) \ mysql_fix_privilege_tables \ - $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ + $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ SUFFIXES = .sh ++++++ mysql-5.1.33-ssl-lib64-macro.patch ++++++ --- config/ac-macros/ssl.m4 2009-04-10 14:05:07.000000000 +0200 +++ config/ac-macros/ssl.m4 2009-04-10 14:15:15.000000000 +0200 @@ -102,7 +102,7 @@ # # Try to link with openSSL libs in <location> # - openssl_libs="-L$location/lib/ -lssl -lcrypto" + openssl_libs="-L$location/lib -L$location/lib64 -lssl -lcrypto" MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) if test "$mysql_ssl_found" == "no" ++++++ mysql-5.1.35-test-utf8.patch ++++++ Index: mysql-test/r/information_schema.result =================================================================== --- mysql-test/r/information_schema.result.orig +++ mysql-test/r/information_schema.result @@ -9,7 +9,7 @@ create user mysqltest_3@localhost; create user mysqltest_3; select * from information_schema.SCHEMATA where schema_name > 'm'; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH -NULL mtr latin1 latin1_swedish_ci NULL +NULL mtr utf8 utf8_unicode_ci NULL NULL mysql latin1 latin1_swedish_ci NULL NULL test latin1 latin1_swedish_ci NULL select schema_name from information_schema.schemata; Index: mysql-test/r/mysql_comments.result =================================================================== --- mysql-test/r/mysql_comments.result.orig +++ mysql-test/r/mysql_comments.result @@ -13,23 +13,23 @@ drop trigger if exists t1_bi; foofct("call 1") call 1 Function sql_mode Create Function character_set_client collation_connection Database Collation -foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx latin1 latin1_swedish_ci latin1_swedish_ci +foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx utf8 utf8_unicode_ci latin1_swedish_ci foofct("call 2") call 2 Function sql_mode Create Function character_set_client collation_connection Database Collation -foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci +foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation -empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci +empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci id data foo 42 Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation -foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) latin1 latin1_swedish_ci latin1_swedish_ci +foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) utf8 utf8_unicode_ci latin1_swedish_ci Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation -nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend latin1 latin1_swedish_ci latin1_swedish_ci +nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend utf8 utf8_unicode_ci latin1_swedish_ci Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation -t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci +t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation -t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci +t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci id data trig 12 "Pass 2 : --enable-comments" @@ -40,23 +40,23 @@ trig 12 foofct("call 1") call 1 Function sql_mode Create Function character_set_client collation_connection Database Collation -foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line latin1 latin1_swedish_ci latin1_swedish_ci +foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line utf8 utf8_unicode_ci latin1_swedish_ci foofct("call 2") call 2 Function sql_mode Create Function character_set_client collation_connection Database Collation -foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci +foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation -empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci +empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci id data foo 42 Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation -foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body latin1 latin1_swedish_ci latin1_swedish_ci +foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body utf8 utf8_unicode_ci latin1_swedish_ci Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation -nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend latin1 latin1_swedish_ci latin1_swedish_ci +nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend utf8 utf8_unicode_ci latin1_swedish_ci Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation -t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci +t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation -t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci +t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci id data trig 12 End of 5.0 tests ++++++ mysql-5.1.35-test-variables-big.patch ++++++ Index: mysql-test/t/variables-big.test =================================================================== --- mysql-test/t/variables-big.test.orig +++ mysql-test/t/variables-big.test @@ -40,22 +40,22 @@ SET SESSION transaction_prealloc_size=10 --replace_column 1 <Id> 6 <Time> # Embedded server is hardcoded to show "Writing to net" as STATE. --replace_result "Writing to net" "NULL" -SHOW PROCESSLIST; +SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size'; SET SESSION transaction_prealloc_size=1024*1024*1024*2; --replace_column 1 <Id> 6 <Time> --replace_result "Writing to net" "NULL" -SHOW PROCESSLIST; +SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size'; SET SESSION transaction_prealloc_size=1024*1024*1024*3; --replace_column 1 <Id> 6 <Time> --replace_result "Writing to net" "NULL" -SHOW PROCESSLIST; +SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size'; SET SESSION transaction_prealloc_size=1024*1024*1024*4; --replace_column 1 <Id> 6 <Time> --replace_result "Writing to net" "NULL" -SHOW PROCESSLIST; +SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size'; SET SESSION transaction_prealloc_size=1024*1024*1024*5; --replace_column 1 <Id> 6 <Time> --replace_result "Writing to net" "NULL" -SHOW PROCESSLIST; +SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size'; --enable_warnings ++++++ mysql-5.1.36-bmove512.patch ++++++ Index: mysys/mf_keycache.c =================================================================== --- mysys/mf_keycache.c.orig +++ mysys/mf_keycache.c @@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach #endif /* Copy data from the cache buffer */ - if (!(read_length & 511)) - bmove512(buff, block->buffer+offset, read_length); - else - memcpy(buff, block->buffer+offset, (size_t) read_length); + memcpy(buff, block->buffer+offset, (size_t) read_length); #if !defined(SERIALIZED_READ_FROM_CACHE) keycache_pthread_mutex_lock(&keycache->cache_lock); @@ -2857,10 +2854,7 @@ int key_cache_insert(KEY_CACHE *keycache #endif /* Copy data from buff */ - if (!(read_length & 511)) - bmove512(block->buffer+offset, buff, read_length); - else - memcpy(block->buffer+offset, buff, (size_t) read_length); + memcpy(block->buffer+offset, buff, (size_t) read_length); #if !defined(SERIALIZED_READ_FROM_CACHE) keycache_pthread_mutex_lock(&keycache->cache_lock); @@ -3164,10 +3158,7 @@ int key_cache_write(KEY_CACHE *keycache, #if !defined(SERIALIZED_READ_FROM_CACHE) keycache_pthread_mutex_unlock(&keycache->cache_lock); #endif - if (!(read_length & 511)) - bmove512(block->buffer+offset, buff, read_length); - else - memcpy(block->buffer+offset, buff, (size_t) read_length); + memcpy(block->buffer+offset, buff, (size_t) read_length); #if !defined(SERIALIZED_READ_FROM_CACHE) keycache_pthread_mutex_lock(&keycache->cache_lock); ++++++ mysql-5.1.36-hotcopy.patch ++++++ === modified file 'scripts/mysqlhotcopy.sh' --- scripts/mysqlhotcopy.sh 2008-03-07 20:45:40 +0000 +++ scripts/mysqlhotcopy.sh 2009-03-12 13:06:42 +0000 @@ -777,7 +777,24 @@ sub get_list_of_tables { } || []; warn "Unable to retrieve list of tables in $db: $@" if $@; - return (map { $_->[0] } @$tables); + my @ignore_tables = (); + + # Ignore tables for the mysql database + if ($db eq 'mysql') { + @ignore_tables = qw(general_log slow_log schema apply_status); + } + + my @res = (); + if ($#ignore_tables > 1) { + my @tmp = (map { $_->[0] } @$tables); + for my $t (@tmp) { + push(@res, $t) if not exists { map { $_=>1 } @ignore_tables }->{$t}; + } + } else { + @res = (map { $_->[0] } @$tables); + } + + return @res; } sub quote_names { ++++++ mysql-5.1.42-myslq-test.patch ++++++ Index: mysql-test/Makefile.am =================================================================== --- mysql-test/Makefile.am.orig +++ mysql-test/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to create Makefile.in -testroot = $(prefix) +testroot = $(datadir) testdir = $(testroot)/mysql-test test_SCRIPTS = mtr \ Index: mysql-test/lib/My/SafeProcess/Makefile.am =================================================================== --- mysql-test/lib/My/SafeProcess/Makefile.am.orig +++ mysql-test/lib/My/SafeProcess/Makefile.am @@ -13,7 +13,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -testroot = $(prefix) +testroot = $(datadir) safedir = $(testroot)/mysql-test/lib/My/SafeProcess #nobase_bin_PROGRAMS = ... safe_PROGRAMS = my_safe_process Index: mysql-test/lib/mtr_cases.pm =================================================================== --- mysql-test/lib/mtr_cases.pm.orig +++ mysql-test/lib/mtr_cases.pm @@ -254,6 +254,7 @@ sub collect_one_suite($) "share/mysql/mysql-test/suite", "share/mysql/mysql-test", # Look in storage engine specific suite dirs + "share/mysql/storage/*/mysql-test-suites", "storage/*/mysql-test-suites" ], [$suite]); ++++++ mysql-cnf.patch ++++++ Index: support-files/my-huge.cnf.sh =================================================================== --- support-files/my-huge.cnf.sh.orig +++ support-files/my-huge.cnf.sh @@ -131,6 +131,10 @@ server-id = 1 #innodb_flush_log_at_trx_commit = 1 #innodb_lock_wait_timeout = 50 +# The safe_mysqld script +[safe_mysqld] +log-error=/var/log/mysql/mysqld.log + [mysqldump] quick max_allowed_packet = 16M Index: support-files/my-large.cnf.sh =================================================================== --- support-files/my-large.cnf.sh.orig +++ support-files/my-large.cnf.sh @@ -131,6 +131,10 @@ server-id = 1 #innodb_flush_log_at_trx_commit = 1 #innodb_lock_wait_timeout = 50 +# The safe_mysqld script +[safe_mysqld] +log-error=/var/log/mysql/mysqld.log + [mysqldump] quick max_allowed_packet = 16M Index: support-files/my-medium.cnf.sh =================================================================== --- support-files/my-medium.cnf.sh.orig +++ support-files/my-medium.cnf.sh @@ -26,6 +26,8 @@ socket = @MYSQL_UNIX_ADDR@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ +# Change following line if you want to store your database elsewhere +datadir = /var/lib/mysql skip-locking key_buffer_size = 16M max_allowed_packet = 1M @@ -129,7 +131,13 @@ server-id = 1 #innodb_flush_log_at_trx_commit = 1 #innodb_lock_wait_timeout = 50 +# The safe_mysqld script +[safe_mysqld] +log-error = /var/log/mysql/mysqld.log +socket = @MYSQL_UNIX_ADDR@ + [mysqldump] +socket = @MYSQL_UNIX_ADDR@ quick max_allowed_packet = 16M Index: support-files/my-small.cnf.sh =================================================================== --- support-files/my-small.cnf.sh.orig +++ support-files/my-small.cnf.sh @@ -65,6 +65,10 @@ server-id = 1 #innodb_flush_log_at_trx_commit = 1 #innodb_lock_wait_timeout = 50 +# The safe_mysqld script +[safe_mysqld] +log-error = /var/log/mysql/mysqld.log + [mysqldump] quick max_allowed_packet = 16M ++++++ mysql-enable-plugins.patch ++++++ diff -Naru scripts/mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sql --- scripts/mysql_fix_privilege_tables.sql 2008-11-14 18:03:14.000000000 +0100 +++ scripts/mysql_fix_privilege_tables.sql 2009-01-09 18:57:47.000000000 +0100 @@ -24,6 +24,17 @@ CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins'; +-- Remember for later if plugin table already existed +set @had_plugin_table= @@warning_count != 0; + +-- Install plugins by default if they didn't existed +CREATE TEMPORARY TABLE tmp_plugin LIKE plugin; +INSERT INTO tmp_plugin (name,dl) VALUES ('ARCHIVE','ha_archive.so'); +INSERT INTO tmp_plugin (name,dl) VALUES ('FEDERATED','ha_federated.so'); +INSERT INTO tmp_plugin (name,dl) VALUES ('BLACKHOLE','ha_blackhole.so'); +INSERT INTO tmp_plugin (name,dl) VALUES ('EXAMPLE','ha_example.so'); +INSERT INTO plugin SELECT * FROM tmp_plugin WHERE @had_plugin_table=0; +DROP TABLE tmp_plugin; CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table'; diff -Naru scripts/mysql_fix_privilege_tables_sql.c scripts/mysql_fix_privilege_tables_sql.c --- scripts/mysql_fix_privilege_tables_sql.c 2008-11-14 18:03:19.000000000 +0100 +++ scripts/mysql_fix_privilege_tables_sql.c 2009-01-09 19:02:35.000000000 +0100 @@ -36,6 +36,17 @@ "\n " "CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins';\n " "\n " +"-- Remember for later if plugin table already existed\n " +"set @had_plugin_table= @@warning_count != 0;\n " +"\n " +"-- Install plugins by default if they didn't existed\n " +"CREATE TEMPORARY TABLE tmp_plugin LIKE plugin;\n " +"INSERT INTO tmp_plugin (name,dl) VALUES ('ARCHIVE','ha_archive.so');\n " +"INSERT INTO tmp_plugin (name,dl) VALUES ('FEDERATED','ha_federated.so');\n " +"INSERT INTO tmp_plugin (name,dl) VALUES ('BLACKHOLE','ha_blackhole.so');\n " +"INSERT INTO tmp_plugin (name,dl) VALUES ('EXAMPLE','ha_example.so');\n " +"INSERT INTO plugin SELECT * FROM tmp_plugin WHERE @had_plugin_table=0;\n " +"DROP TABLE tmp_plugin;\n " "\n " "CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';\n " "\n " diff -Naru scripts/mysql_system_tables.sql scripts/mysql_system_tables.sql --- scripts/mysql_system_tables.sql 2008-11-14 17:37:05.000000000 +0100 +++ scripts/mysql_system_tables.sql 2009-01-09 19:00:35.000000000 +0100 @@ -24,6 +24,17 @@ CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins'; +-- Remember for later if plugin table already existed +set @had_plugin_table= @@warning_count != 0; + +-- Install plugins by default if they didn't existed +CREATE TEMPORARY TABLE tmp_plugin LIKE plugin; +INSERT INTO tmp_plugin (name,dl) VALUES ('ARCHIVE','ha_archive.so'); +INSERT INTO tmp_plugin (name,dl) VALUES ('FEDERATED','ha_federated.so'); +INSERT INTO tmp_plugin (name,dl) VALUES ('BLACKHOLE','ha_blackhole.so'); +INSERT INTO tmp_plugin (name,dl) VALUES ('EXAMPLE','ha_example.so'); +INSERT INTO plugin SELECT * FROM tmp_plugin WHERE @had_plugin_table=0; +DROP TABLE tmp_plugin; CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table'; ++++++ mysql-group.patch ++++++ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -772,6 +772,14 @@ AC_ARG_WITH(mysqld-user, [ MYSQLD_USER=mysql ] ) AC_SUBST(MYSQLD_USER) +AC_ARG_WITH(mysqld-group, + [ --with-mysqld-group=groupname + What group the mysqld daemon shall be run as.], + [ MYSQLD_GROUP=$withval ], + [ MYSQLD_GROUP=mysql ] + ) +AC_SUBST(MYSQLD_GROUP) + # If we should allow LOAD DATA LOCAL AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default) Index: scripts/Makefile.am =================================================================== --- scripts/Makefile.am.orig +++ scripts/Makefile.am @@ -185,6 +185,7 @@ SUFFIXES = .sh -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ + -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \ -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ Index: scripts/mysqld_safe.sh =================================================================== --- scripts/mysqld_safe.sh.orig +++ scripts/mysqld_safe.sh @@ -19,6 +19,7 @@ logging=init want_syslog=0 syslog_tag= user='@MYSQLD_USER@' +group='@MYSQLD_GROUP@' pid_file= err_log= @@ -162,6 +163,7 @@ parse_arguments() { --datadir=*) DATADIR="$val" ;; --pid-file=*) pid_file="$val" ;; --user=*) user="$val"; SET_USER=1 ;; + --group=*) group="$val"; SET_USER=1 ;; # these might have been set in a [mysqld_safe] section of my.cnf # they are added to mysqld command line to override settings from my.cnf @@ -388,11 +390,17 @@ then if test "$user" != "root" -o $SET_USER = 1 then USER_OPTION="--user=$user" + GROUP_OPTION="--group=$group" fi # Change the err log to the right user, if it is in use if [ $want_syslog -eq 0 ]; then touch "$err_log" - chown $user "$err_log" + if [ "$user" -a "$group" ]; then + chown $user:$group $err_log + else + [ "$user" ] && chown $user $err_log + [ "$group" ] && chgrp $group $err_log + fi fi if test -n "$open_files" then @@ -407,7 +415,12 @@ mysql_unix_port_dir=`dirname $safe_mysql if [ ! -d $mysql_unix_port_dir ] then mkdir $mysql_unix_port_dir - chown $user $mysql_unix_port_dir + if [ "$user" -a "$group" ]; then + chown $user:$group $mysql_unix_port_dir + else + [ "$user" ] && chown $user $mysql_unix_port_dir + [ "$group" ] && chgrp $group $mysql_unix_port_dir + fi chmod 755 $mysql_unix_port_dir fi Index: scripts/mysql_install_db.sh =================================================================== --- scripts/mysql_install_db.sh.orig +++ scripts/mysql_install_db.sh @@ -28,6 +28,7 @@ args="" defaults="" mysqld_opt="" user="" +group="" force=0 in_rpm=0 @@ -63,6 +64,11 @@ Usage: $0 [OPTIONS] user. You must be root to use this option. By default mysqld runs using your current login name and files and directories that it creates will be owned by you. + --group=group_name The login group to use for running mysqld. Files and + directories created by mysqld will be owned by this + group. You must be root to use this option. By default + mysqld runs using your current group and files and + directories that it creates will be owned by you. All other options are passed to the mysqld program @@ -103,11 +109,11 @@ parse_arguments() --builddir=*) builddir=`parse_arg "$arg"` ;; --srcdir=*) srcdir=`parse_arg "$arg"` ;; --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;; - --user=*) # Note that the user will be passed to mysqld so that it runs # as 'user' (crucial e.g. if log-bin=/some_other_path/ # where a chown of datadir won't help) - user=`parse_arg "$arg"` ;; + --user=*) user=`parse_arg "$arg"` ;; + --group=*) group=`parse_arg "$arg"` ;; --skip-name-resolve) ip_only=1 ;; --verbose) verbose=1 ;; # Obsolete --rpm) in_rpm=1 ;; @@ -360,7 +366,12 @@ do fi if test -w / -a ! -z "$user" then - chown $user $dir + if test -z "$group" + then + chown $user $dir + else + chown $user:$group $dir + fi fi done @@ -369,6 +380,11 @@ then args="$args --user=$user" fi +if test -n "$group" +then + args="$args --group=$group" +fi + # When doing a "cross bootstrap" install, no reference to the current # host should be added to the system tables. So we filter out any # lines which contain the current host name. ++++++ mysql-install_db-quiet.patch ++++++ Index: scripts/mysql_install_db.sh =================================================================== --- scripts/mysql_install_db.sh.orig +++ scripts/mysql_install_db.sh @@ -456,9 +456,11 @@ fi # the screen. if test "$cross_bootstrap" -eq 0 && test -z "$srcdir" then - s_echo - s_echo "To start mysqld at boot time you have to copy" - s_echo "support-files/mysql.server to the right place for your system" +# SuSE Installs init script ;-) +# +# s_echo +# s_echo "To start mysqld at boot time you have to copy" +# s_echo "support-files/mysql.server to the right place for your system" echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !" @@ -480,10 +482,10 @@ then then echo echo "You can start the MariaDB daemon with:" - echo "cd $basedir ; $bindir/mysqld_safe &" + echo "rcmysql start" echo - echo "You can test the MariaDB daemon with mysql-test-run.pl" - echo "cd $basedir/mysql-test ; perl mysql-test-run.pl" + echo "You can test the MariaDB daemon with mariadb-test package" +# echo "cd $basedir/mysql-test ; perl mysql-test-run.pl" fi echo ++++++ mysql-logrotate.patch ++++++ Index: support-files/mysql-log-rotate.sh =================================================================== --- support-files/mysql-log-rotate.sh.orig +++ support-files/mysql-log-rotate.sh @@ -18,7 +18,7 @@ # ATTENTION: This /root/.my.cnf should be readable ONLY # for root ! -@localstatedir@/mysqld.log { +/var/log/mysql/mysqld.log { # create 600 mysql mysql notifempty daily @@ -31,6 +31,14 @@ @bindir@/mysqladmin ping &>/dev/null then @bindir@/mysqladmin flush-logs + ret=$? + if test $ret -ne 0 + then + echo "@sysconfdir@/logrotate.d/mysql failed, probably because" >&2 + echo "the root acount is protected by password." >&2 + echo "See comments in @sysconfdir@/logrotate.d/mysql on how to fix this" >&2 + exit $ret + fi fi endscript } ++++++ mysql-multi-configuration.patch ++++++ --- support-files/my-medium.cnf.sh | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) --- support-files/my-medium.cnf.sh.orig +++ support-files/my-medium.cnf.sh @@ -158,3 +158,46 @@ write_buffer = 2M [mysqlhotcopy] interactive-timeout + +[mysqld_multi] +mysqld = /usr/bin/mysqld_safe +mysqladmin = /usr/bin/mysqladmin +log = /var/log/mysqld_multi.log +# user = multi_admin +# password = secret + +# If you want to use mysqld_multi uncomment 1 or more mysqld sections +# below or add your own ones. + +# WARNING +# -------- +# If you uncomment mysqld1 than make absolutely sure, that database mysql, +# configured above, is not started. This may result in corrupted data! +# [mysqld1] +# port = @MYSQL_TCP_PORT@ +# datadir = /var/lib/mysql +# pid-file = /var/lib/mysql/mysqld.pid +# socket = /var/lib/mysql/mysql.sock +# user = mysql + +# [mysqld2] +# port = 3307 +# datadir = /var/lib/mysql-databases/mysqld2 +# pid-file = /var/lib/mysql-databases/mysqld2/mysql.pid +# socket = /var/lib/mysql-databases/mysqld2/mysql.sock +# user = mysql + +# [mysqld3] +# port = 3308 +# datadir = /var/lib/mysql-databases/mysqld3 +# pid-file = /var/lib/mysql-databases/mysqld3/mysql.pid +# socket = /var/lib/mysql-databases/mysqld3/mysql.sock +# user = mysql + +# [mysqld6] +# port = 3309 +# datadir = /var/lib/mysql-databases/mysqld6 +# pid-file = /var/lib/mysql-databases/mysqld6/mysql.pid +# socket = /var/lib/mysql-databases/mysqld6/mysql.sock +# user = mysql + ++++++ mysql-plugins-avoid-version.patch ++++++ Index: storage/archive/Makefile.am =================================================================== --- storage/archive/Makefile.am.orig +++ storage/archive/Makefile.am @@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r EXTRA_LTLIBRARIES = ha_archive.la pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ -ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_SOURCES = ha_archive.cc azio.c Index: storage/blackhole/Makefile.am =================================================================== --- storage/blackhole/Makefile.am.orig +++ storage/blackhole/Makefile.am @@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h EXTRA_LTLIBRARIES = ha_blackhole.la pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ -ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) +ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_SOURCES=ha_blackhole.cc Index: storage/csv/Makefile.am =================================================================== --- storage/csv/Makefile.am.orig +++ storage/csv/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = ha_tina.h transparent EXTRA_LTLIBRARIES = ha_csv.la pkglib_LTLIBRARIES = @plugin_csv_shared_target@ -ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ha_csv_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) ha_csv_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc Index: storage/example/Makefile.am =================================================================== --- storage/example/Makefile.am.orig +++ storage/example/Makefile.am @@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h EXTRA_LTLIBRARIES = ha_example.la pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ -ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_SOURCES = ha_example.cc Index: storage/federatedx/Makefile.am =================================================================== --- storage/federatedx/Makefile.am.orig +++ storage/federatedx/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat EXTRA_LTLIBRARIES = ha_federatedx.la pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ -ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN Index: storage/ibmdb2i/Makefile.am =================================================================== --- storage/ibmdb2i/Makefile.am.orig +++ storage/ibmdb2i/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = ha_ibmdb2i.h db2i_colla EXTRA_LTLIBRARIES = ha_ibmdb2i.la pkgplugin_LTLIBRARIES = @plugin_ibmdb2i_shared_target@ ha_ibmdb2i_la_LIBADD = -liconv -ha_ibmdb2i_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ha_ibmdb2i_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) ha_ibmdb2i_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_ibmdb2i_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_ibmdb2i_la_SOURCES = ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \ Index: storage/pbxt/src/Makefile.am =================================================================== --- storage/pbxt/src/Makefile.am.orig +++ storage/pbxt/src/Makefile.am @@ -35,7 +35,7 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache systab_xt.cc ha_xtsys.cc discover_xt.cc backup_xt.cc \ util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc -libpbxt_la_LDFLAGS = -module +libpbxt_la_LDFLAGS = -module -avoid-version # These are the warning Drizzle uses: # DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter Index: storage/xtradb/Makefile.am =================================================================== --- storage/xtradb/Makefile.am.orig +++ storage/xtradb/Makefile.am @@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS) EXTRA_LTLIBRARIES= ha_innodb.la pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@ -ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir) +ha_innodb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES) ++++++ mysql.SuSEfirewall2 ++++++ ## Name: MySQL server ## Description: opens ports for MySQL in order to allow other hosts connect to it # space separated list of allowed TCP ports TCP="3306" ++++++ mysql_config.patch ++++++ --- scripts/mysql_config.sh.orig +++ scripts/mysql_config.sh @@ -92,7 +92,7 @@ fix_path pkgincludedir include/mysql inc version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' -ldflags='@LDFLAGS@' +ldflags='@SAVE_LDFLAGS@' if [ @MYSQL_TCP_PORT_DEFAULT@ -eq 0 ]; then port=0 ++++++ mysql_upgrade-exit-status.patch ++++++ returning non-zero exit status in this case is not nice to scripts using mysql_upgrade (eg. our init script) --- client/mysql_upgrade.c | 4 +++- mysql-test/t/mysql_upgrade.test | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) --- client/mysql_upgrade.c.orig +++ client/mysql_upgrade.c @@ -758,7 +758,9 @@ int main(int argc, char **argv) printf("This installation of MySQL is already upgraded to %s, " "use --force if you still need to run mysql_upgrade\n", MYSQL_SERVER_VERSION); - die(NULL); + free_used_memory(); + my_end(MY_CHECK_ERROR); + exit(0); } /* --- mysql-test/t/mysql_upgrade.test.orig +++ mysql-test/t/mysql_upgrade.test @@ -19,7 +19,7 @@ file_exists $MYSQLTEST_VARDIR/master-dat --echo Run it again - should say already completed --replace_result $MYSQL_SERVER_VERSION VERSION ---error 1 +--error 0 --exec $MYSQL_UPGRADE --skip-verbose 2>&1 # It should have created a file in the MySQL Servers datadir ++++++ mysqld_multi.patch ++++++ --- scripts/mysqld_multi.sh | 108 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 100 insertions(+), 8 deletions(-) Index: scripts/mysqld_multi.sh =================================================================== --- scripts/mysqld_multi.sh.orig +++ scripts/mysqld_multi.sh @@ -2,6 +2,7 @@ use Getopt::Long; use POSIX qw(strftime getcwd); +use File::Path qw(mkpath); $|=1; $VER="2.16"; @@ -123,6 +124,7 @@ sub main usage() if (!defined($ARGV[0]) || (!($ARGV[0] =~ m/^start$/i) && !($ARGV[0] =~ m/^stop$/i) && + !($ARGV[0] =~ m/^reload$/i) && !($ARGV[0] =~ m/^report$/i))); if (!$opt_no_log) @@ -136,7 +138,7 @@ sub main print strftime "%a %b %e %H:%M:%S %Y", localtime; print "\n"; } - if ($ARGV[0] =~ m/^start$/i) + if (($ARGV[0] =~ m/^start$/i) || ($ARGV[0] =~ m/^reload$/i)) { if (!defined(($mysqld= my_which($opt_mysqld))) && $opt_verbose) { @@ -145,7 +147,11 @@ sub main print "This is OK, if you are using option \"mysqld=...\" in "; print "groups [mysqldN] separately for each.\n\n"; } - start_mysqlds(); + if ($ARGV[0] =~ m/^start$/i) { + start_mysqlds(); + } elsif ($ARGV[0] =~ m/^reload$/i) { + reload_mysqlds(); + } } else { @@ -301,6 +307,39 @@ sub start_mysqlds() $com= "$mysqld"; for ($j = 0, $tmp= ""; defined($options[$j]); $j++) { + if ("--datadir=" eq substr($options[$j], 0, 10)) { + $datadir = $options[$j]; + $datadir =~ s/\-\-datadir\=//; + eval { mkpath($datadir) }; + if ($@) { + print "FATAL ERROR: Cannot create data directory $datadir: $!\n"; + exit(1); + } + if (! -d $datadir."/mysql") { + if (-w $datadir) { + print "\n\nInstalling new database in $datadir\n\n"; + $install_cmd="@bindir@/mysql_install_db "; + $install_cmd.="--user=mysql "; + $install_cmd.="--datadir=$datadir"; + system($install_cmd); + } else { + print "\n"; + print "FATAL ERROR: Tried to create mysqld under group [$groups[$i]],\n"; + print "but the data directory is not writable.\n"; + print "data directory used: $datadir\n"; + exit(1); + } + } + + if (! -d $datadir."/mysql") { + print "\n"; + print "FATAL ERROR: Tried to start mysqld under group [$groups[$i]],\n"; + print "but no data directory was found or could be created.\n"; + print "data directory used: $datadir\n"; + exit(1); + } + } + if ("--mysqladmin=" eq substr($options[$j], 0, 13)) { # catch this and ignore @@ -365,6 +404,58 @@ sub start_mysqlds() } #### +#### reload multiple servers +#### + +sub reload_mysqlds() +{ + my (@groups, $com, $tmp, $i, @options, $j); + + if (!$opt_no_log) + { + w2log("\nReloading MySQL servers\n","$opt_log",0,0); + } + else + { + print "\nReloading MySQL servers\n"; + } + @groups = &find_groups($groupids); + for ($i = 0; defined($groups[$i]); $i++) + { + $mysqld_server = $mysqld; + @options = defaults_for_group($groups[$i]); + + for ($j = 0, $tmp= ""; defined($options[$j]); $j++) + { + if ("--mysqladmin=" eq substr($options[$j], 0, 13)) + { + # catch this and ignore + } + elsif ("--mysqld=" eq substr($options[$j], 0, 9)) + { + $options[$j] =~ s/\-\-mysqld\=//; + $mysqld_server = $options[$j]; + } + elsif ("--pid-file=" eq substr($options[$j], 0, 11)) + { + $options[$j] =~ s/\-\-pid-file\=//; + $pid_file = $options[$j]; + } + } + $com = "killproc -p $pid_file -HUP $mysqld_server"; + system($com); + + $com = "touch $pid_file"; + system($com); + } + if (!$i && !$opt_no_log) + { + w2log("No MySQL servers to be reloaded (check your GNRs)", + "$opt_log", 0, 0); + } +} + +### #### stop multiple servers #### @@ -727,7 +818,7 @@ sub usage $my_progname version $VER by Jani Tolonen Description: -$my_progname can be used to start, or stop any number of separate +$my_progname can be used to start, reload, or stop any number of separate mysqld processes running in different TCP/IP ports and UNIX sockets. $my_progname can read group [mysqld_multi] from my.cnf file. You may @@ -745,16 +836,16 @@ starting from 1. These groups should be [mysqld] group, but with those port, socket and any other options that are to be used with each separate mysqld process. The number in the group name has another function; it can be used for starting, -stopping, or reporting any specific mysqld server. +reloading, stopping, or reporting any specific mysqld server. -Usage: $my_progname [OPTIONS] {start|stop|report} [GNR,GNR,GNR...] -or $my_progname [OPTIONS] {start|stop|report} [GNR-GNR,GNR,GNR-GNR,...] +Usage: $my_progname [OPTIONS] {start|reload|stop|report} [GNR,GNR,GNR...] +or $my_progname [OPTIONS] {start|reload|stop|report} [GNR-GNR,GNR,GNR-GNR,...] -The GNR means the group number. You can start, stop or report any GNR, +The GNR means the group number. You can start, reload, stop or report any GNR, or several of them at the same time. (See --example) The GNRs list can be comma separated or a dash combined. The latter means that all the GNRs between GNR1-GNR2 will be affected. Without GNR argument all the -groups found will either be started, stopped, or reported. Note that +groups found will either be started, reloaded, stopped, or reported. Note that syntax for specifying GNRs must appear without spaces. Options: ++++++ rc.mysql-multi ++++++ #!/bin/bash # Copyright (c) 1995-2010 SuSE Linux AG Nuernberg, Germany. # # Author: Lenz Grimmer # Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> # # mysqld_multi extension added by Richard Bos, 2008 # # /etc/init.d/mysql # # and its symbolic link # # /usr/sbin/rcmysql # ### BEGIN INIT INFO # Provides: mysql # Required-Start: $network $remote_fs # Required-Stop: $network $remote_fs # Default-Start: 2 3 5 # Default-Stop: # Short-Description: Start the MySQL database server # Description: Start the MySQL database server ### END INIT INFO # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. # Check for the location of initscript if [ "`echo "$0" | grep "^\."`" ] || [ "`echo "$0" | grep "^[^/].*/"`" ]; then MYSELF="`pwd`/$0" else MYSELF="$0" fi parse_arguments() { for arg do case "$arg" in --basedir=*) basedir="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; --datadir=*) datadir="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; --pid-file=*) pid_file="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; --socket=*) socket="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; --log-error=*) log_error="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; esac done } wait_for_socket() { local i for((i=0; i<150; i++)); do sleep 0.2 test -S $1 && i='' && break done test -z "$i" || return 1 return 0 } # Don't run killproc -TERM, as it could send a SIGKILL as well, possibly # resulting in database corruption. Run kill -TERM manually instead, wait # approximately 300 seconds and fail if mysql doesn't respond. This will at # least prevent the SIGKILL when doing 'rcmysql stop' manually. During system # shutdown, we are out of luck... # See https://bugzilla.novell.com/show_bug.cgi?id=223209 kill_mysql () { local pid exe test -e "$pid_file" || return 7 # not running pid=`cat "$pid_file"` || return 4 # insufficient privileges if ! test -e /proc/version; then mount -n -t proc proc /proc test -e /proc/version || return 100 fi test -L "/proc/$pid/exe" || return 7 exe=`readlink "/proc/$pid/exe"` || return 4 test "`echo "$exe" | grep "^$MYSQLD"`" || return 7 kill -STOP "$pid" kill -TERM "$pid" || return 4 # suboptimal kill -CONT "$pid" for i in `seq 3000`; do # mysqld removes its pid file test -e "$pid_file" || return 0 LC_ALL=C sleep 0.1 done test -e "$pid_file" || return 0 return 1 } # Helper function which can end with any status set_return_value() { return $1 } # Checks for obsolete database check_obsolete() { # check for ISAM tables tables="`find "$datadir" -name '*.ISM' 2> /dev/null | sed "s@$datadir/*@@; s@.ISM@@; s@/@.@;"`" if test "$tables" ; then echo echo "Some tables still use ISAM format, which is NO LONGER SUPPORTED" echo "since mysql 5.0. To use these tables, you would need to open them" echo "from an older mysql server and convert to something better (eg. MyISAM)." echo echo "Tables using ISAM are: " echo " $tables " echo fi # check for bdb tables tables="`find "$datadir" -name '*.db' 2> /dev/null | sed "s@$datadir/*@@; s@.db@@; s@/@.@;"`" if test -n "$tables" ; then echo echo "Some tables still use BerkeleyDB format, which is NO LONGER SUPPORTED" echo "since mysql 5.1. To use these tables, you would need to open them" echo "from an older mysql server and convert to something better (eg. MyISAM)." echo echo "Tables using BerkeleyDB are: " echo " $tables " echo fi } # Check if we want to run multiple instances. [[ "`cat /etc/my.cnf | sed -n 's|^[[:blank:]]*\[mysqld[0-9]\+\]|yes|p'`" ]] && MYSQLD_MULTI=yes # This was old way how to specify this, left for backward compatibility. [[ -f /etc/sysconfig/mysql ]] && . /etc/sysconfig/mysql if [[ "$MYSQLD_MULTI" == "yes" ]]; then [[ -x /usr/bin/mysqld_multi ]] || { echo -n "MySQL: /usr/bin/mysqld_multi not found" rc_failed 5; rc_status -v; rc_exit; } case "$1" in start) # FIXME: # We assume a fresh install if the directory $datadir/mysql # does not exist and create the privilege database # if ! test -d $datadir/mysql; then # echo -n "Creating MySQL privilege database... " # mysql_install_db --user=$mysql_daemon_user --datadir=$datadir || { # rc_failed; rc_status -v; rc_exit # } # fi echo -n "Starting service multi MySQL " mysqld_multi start # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down service multi MySQL " mysqld_multi stop # Remember status and be verbose rc_status -v ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) "$MYSELF" status >/dev/null && "$MYSELF" restart # Remember status and be quiet rc_status ;; restart|force-reload) echo "Restarting service multi MySQL " "$MYSELF" stop "$MYSELF" start rc_status ;; reload) echo -n "Reloading service multi MySQL " mysqld_multi reload rc_status -v ;; status) STATUS=$(mysqld_multi report) echo -n "$STATUS" # Set the status for rc_status echo "$STATUS" | grep -q "is running" rc_status -v ;; *) echo "Usage: $MYSELF {start|stop|status|reload|restart|try-restart|force-reload}" exit 1 ;; esac else # Test, if mysqld or mysql-max actually exist unset MYSQLD # use mysqld-debug only if explicitly requested (TODO: sysconfig variable?) if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug then MYSQLD=/usr/sbin/mysqld-debug elif test -x /usr/sbin/mysqld-max then MYSQLD=/usr/sbin/mysqld-max elif test -x /usr/sbin/mysqld then MYSQLD=/usr/sbin/mysqld fi test "$MYSQLD" || { echo -n "Nor /usr/sbin/mysqld nor /usr/sbin/mysqld-max exists"; rc_failed 5; rc_status -v; rc_exit; } # The following section has been taken from # the original MySQL init script # Note: If you want to change these variables, you'll make your life easier # if you do so in /etc/my.cnf, which is preserved during upgrades basedir=/usr datadir=/var/lib/mysql mysql_daemon_user=mysql mysql_daemon_group=mysql pid_file=/var/run/mysql/mysqld.pid socket=/var/run/mysql/mysql.sock print_defaults=/usr/bin/my_print_defaults log_error=/var/log/mysql/mysqld.log mode=$1 # start or stop log_base="`echo "$log_error" | sed 's|\.log$||'`" [ "$log_base" \!= "$log_error" ] || log_base="/var/log/mysql/mysql" log_upgrade="${log_base}-upgrade.log" log_upgrade_run="${log_base}-upgrade-run.log" log_query="${log_base}-query.log" parse_arguments `$print_defaults $defaults mysqld mysql_server` export TMPDIR="`cat /var/run/mysql/tmpdir 2> /dev/null`" # Safeguard (relative paths, core dumps..) cd "$basedir" case "$1" in start) # exit gracefully, if we are already running "$MYSELF" status >/dev/null && echo -n "Starting service MySQL " && \ rc_status -v && rc_exit # prepare tmp dir if [ "$TMPDIR" ] && [ -d "$TMPDIR" ] && \ [ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then rm -rf "$TMPDIR" fi TMPDIR="`mktemp -d -p /var/tmp mysql.XXXXXX | tee /var/run/mysql/tmpdir`" [ -z "$TMPDIR" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$TMPDIR" [ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || { echo "Can't create secure $TMPDIR" rc_failed; rc_status -v; rc_exit; } # Test, if safe_mysqld actually exists SAFE_MYSQLD=/usr/bin/mysqld_safe test -x $SAFE_MYSQLD || { echo "$SAFE_MYSQLD does not exist "; rc_failed 5; rc_status -v; rc_exit; } debug_flags="" if test "$MYSQLD_DEBUG" = yes; then # add --log, --core-file and --debug # but only if not already set in my.cnf if ! $print_defaults mysqld | \ grep -q -e '--log$' -e '--log[[:blank:]=]' then debug_flags="--log=${log_query}" fi if ! $print_defaults mysqld | grep -q -e '^--debug\>' && test "$MYSQLD" = /usr/sbin/mysqld-debug then debug_flags="$debug_flags --debug=d:t:F:L:o,$datadir/mysqld.trace" fi if ! $print_defaults mysqld | grep -q -e '^--core-file\>' then debug_flags="$debug_flags --core-file" fi fi # Creating parent directories for logs for i in "$log_upgrade" "$log_query" "$log_error"; do log_dir="`dirname "$i"`" if [ \! -d "$log_dir" ]; then mkdir -p "$log_dir" chmod 660 "$log_dir" fi done # We assume a fresh install if the directory $datadir/mysql # does not exist and create the privilege database if ! test -d "$datadir/mysql"; then echo "Creating MySQL privilege database... " mysql_install_db --user="$mysql_daemon_user" --datadir="$datadir" ||{ rc_failed; rc_status -v; rc_exit } fi check_obsolete # Run mysql_upgrade on every package install/upgrade. Not allways # necessary, but doesn't do any harm. if test -f "$datadir/.run-mysql_upgrade" ; then echo >> "$log_upgrade" echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade" echo >> "$log_upgrade" echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade" echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade" # Check logs for inconsistencies SRCLOGS="" ALL_SRCLOGS="" for i in "$log_error" /var/lib/mysql/mysqld.log \ /var/log/mysqld.log ; do if test -f "$i"; then SRCLOGS="$i" ALL_SRCLOGS="${ALL_SRCLOGS} ${i}" fi done if [ "${ALL_SRCLOGS}" \!= " ${SRCLOGS}" ]; then echo "Log files inconsistency, please merge following files manually:" echo $ALL_SRCLOGS | sed 's|[[:blank:]]\+|\n|' | sed 's|^|\t|' else if [ "$SRCLOGS" ]; then [ "$SRCLOGS" = "$log_error" ] || mv "$SRCLOGS" "$log_error" fi fi check_obsolete >> "$log_upgrade" # instead of running mysqld --bootstrap, which wouldn't allow # us to run mysql_upgrade, we start a full-featured server with # --skip-grant-tables and restict access to it by unix # permissions of the named socket protected="`cat /var/run/mysql/protecteddir 2> /dev/null`" if [ -d "$protected" ]; then pid="`cat "$protected/mysqld.pid" 2> /dev/null`" if [ "$pid" ] && [ -d "/proc/$pid" ] && [ "`readlink "/proc/$pid/exe" | grep "mysql"`" ]; then echo "Can't update as another updating process is currently running" | tee -a "$log_upgrade" echo "Please check process $pid and terminate it before restarting MySQL" | tee -a "$log_upgrade" rc_failed; rc_status -v; rc_exit; else rm -rf "$protected" fi fi protected="`mktemp -d -p /var/tmp mysql-protected.XXXXXX | tee /var/run/mysql/protecteddir`" [ -z "$protected" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$protected" [ "`ls -ld "$protected" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || { echo "Can't create secure $protected" | tee -a "$log_upgrade" rc_failed; rc_status -v; rc_exit; } echo "Running protected MySQL... " | tee -a "$log_upgrade" $SAFE_MYSQLD \ --mysqld=${MYSQLD#/usr/sbin/} \ $debug_flags \ --skip-networking \ --skip-grant-tables \ --datadir="$datadir" \ --user="$mysql_daemon_user" \ --log-error="$log_upgrade_run" \ --socket="$protected/mysql.sock" \ --pid-file="$protected/mysqld.pid" \ --group="$mysql_daemon_group" &>/dev/null & wait_for_socket "$protected/mysql.sock" || { echo "error: $protected/mysql.sock file didn't appeared... " | tee -a "$log_upgrade" echo " Try checking \"$log_upgrade_run\"... " | tee -a "$log_upgrade" rc_failed; rc_status -v; rc_exit; } echo "Upgrading MySQL... " | tee -a "$log_upgrade" /usr/bin/mysql_upgrade \ --socket="$protected/mysql.sock" | tee -a "$log_upgrade" [ "$PIPESTATUS" -ne 0 ] && { rc_failed; rc_status -v; kill -TERM "`cat $protected/mysqld.pid`" rc_exit; } kill -TERM "`cat $protected/mysqld.pid`" rm -rf "$protected" # Fix ownerships and permissions for $datadir chmod 750 "$datadir" chown -R "$mysql_daemon_user:$mysql_daemon_group" "$datadir" rm -f "$datadir/.run-mysql_upgrade" \ "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past chown "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade" chmod 640 "$log_upgrade" fi echo -n "Starting service MySQL " $SAFE_MYSQLD \ --mysqld=${MYSQLD#/usr/sbin/} \ $debug_flags \ --user="$mysql_daemon_user" \ --pid-file="$pid_file" \ --socket="$socket" \ --datadir="$datadir" &>/dev/null & wait_for_socket "$socket" || { # let's not treat this as a fatal error echo "warning: $socket didn't appear within 30 seconds" } chmod a+r "$pid_file" # Rmember status and be verbose rc_status -v ;; stop) echo -n "Shutting down service MySQL " kill_mysql if [ "$TMPDIR" ] && [ -d "$TMPDIR" ] && \ [ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then rm -rf "$TMPDIR" fi # Remember status and be verbose rc_status -v ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) "$MYSELF" status >/dev/null && "$MYSELF" restart # Remember status and be quiet rc_status ;; restart|force-reload) echo "Restarting service MySQL " "$MYSELF" stop "$MYSELF" start rc_status ;; reload) echo -n "Reloading service MySQL " kill -HUP "`cat "$pid_file"`" touch "$pid_file" rc_status -v ;; check|status) echo -n "Checking for service MySQL: " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Status has a slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values, # but it checks for running binary first and only # if it doesn't find running process with proper # name it checks pidfile. So we can't use it because # akonadi runs it's own database. # checkproc -p $pid_file $MYSQLD if [ -f "$pid_file" ]; then if ! [ -e /proc/version ]; then mount -n -t proc proc /proc test -e /proc/version || set_return_value 100 fi pid="`cat "$pid_file"`" if [ "$pid" ] && [ -d "/proc/$pid" ]; then cmd=`cat "/proc/$pid/cmdline" 2> /dev/null` exe=`readlink "/proc/$pid/exe" 2> /dev/null` if [ "`echo "$exe" | grep "^$MYSQLD"`" ] || [ "`echo "$cmd" | grep "^$MYSQLD"`" ]; then set_return_value 0 else set_return_value 1 fi else set_return_value 1 fi else set_return_value 3 fi rc_status -v ;; *) echo "Usage: $MYSELF {start|stop|status|reload|restart|try-restart|force-reload}" exit 1 ;; esac fi rc_exit # vim: ft=sh ++++++ suse-test-run ++++++ #!/usr/bin/perl # # Test the SUSE mysql(-Max) package using the MySQL testsuite my $id = getpwnam("mysql") or die "can't find user \"mysql\": $!"; my $dir = "/usr/share/mysql-test/"; if ($< == 0) { ($<, $>) = ($id, $id); if ($< != $id || $> != $id) { die "can't switch to user mysql(id $id): $!"; } } chdir($dir) or die "can't cd to $dir: $!"; exec("./mysql-test-run.pl", "--big-test", @ARGV); die "can't execute mysql-test-run.pl: $!"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit protobuf for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at Wed May 5 23:41:14 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ protobuf/protobuf.changes 2010-04-26 13:26:11.000000000 +0200 @@ -0,0 +1,39 @@ +------------------------------------------------------------------- +Mon Apr 26 11:23:57 UTC 2010 - lnussel(a)suse.de + +- merge features with version from devel:tools:building + * build java and python versions + * disable static libraries + +------------------------------------------------------------------- +Sat Apr 24 18:12:57 UTC 2010 - lnussel(a)suse.de + +- new version 2.3.0 + +------------------------------------------------------------------- +Sat Apr 24 18:07:39 UTC 2010 - lnussel(a)suse.de + +- separate soname define + +------------------------------------------------------------------- +Mon Dec 7 12:39:37 UTC 2009 - lnussel(a)suse.de + +- new version 2.2.0a + +------------------------------------------------------------------- +Tue Mar 31 09:51:34 CEST 2009 - lnussel(a)suse.de + +- move protoc to devel package +- split according to library policy +- install vim syntax file + +------------------------------------------------------------------- +Wed Sep 03 00:00:00 CET 2008 - Lenz Grimmer <lenzg(a)grimmer.com> + +- Update to version 2.0.1 + +------------------------------------------------------------------- +Wed Aug 13 00:00:00 CET 2008 - Lenz Grimmer <lenz(a)grimmer.com> + +- Initial package the openSUSE build service (Version 2.0.0beta) + calling whatdependson for head-i586 New: ---- baselibs.conf manifest.txt.in protobuf-2.3.0.tar.bz2 protobuf-setuptools-2.2.0.patch protobuf.changes protobuf.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ # # spec file for package protobuf (Version 2.3.0) # # Copyright (c) 2010 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/ # # norootforbuild %define soname 6 %bcond_without check %if 0%{?fedora_version} > 8 || 0%{?mandriva_version} > 2008 || 0%{?suse_version} > 1030 %bcond_without protobuf_java %else %bcond_with protobuf_java %endif %if 0%{?suse_version} > 1100 %bcond_without protobuf_python %else %bcond_with protobuf_python %endif Name: protobuf Summary: Protocol Buffers - Google's data interchange format Version: 2.3.0 Release: 1 License: New BSD License Group: Development/Libraries/C and C++ Url: http://code.google.com/p/protobuf/ Source0: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: manifest.txt.in Patch0: protobuf-setuptools-2.2.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif %if %{with protobuf_java} BuildRequires: java-devel >= 1.6.0 %endif %if %{with protobuf_python} BuildRequires: python python-devel python-setuptools %endif %description Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package -n libprotobuf%{soname} Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries %description -n libprotobuf%{soname} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package -n libprotoc%{soname} Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries %description -n libprotoc%{soname} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package -n libprotobuf-lite%{soname} Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries %description -n libprotobuf-lite%{soname} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. %package devel License: New BSD License Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: gcc-c++ %description devel Development files for Google Protocol Buffers %if %{with protobuf_java} %package -n %{name}-java Group: Development/Libraries/Java Requires: java >= 1.6.0 Summary: Java Bindings for Google Protocol Buffers %description -n %{name}-java This package contains the Java bindings for Google Protocol Buffers. %endif %if %{with protobuf_python} %package -n python-%{name} Group: Development/Libraries/Python %if 0%{?suse_version} %py_requires %else Requires: python %endif Summary: Python Bindings for Google Protocol Buffers %description -n python-%{name} This package contains the Python bindings for Google Protocol Buffers. %endif %prep %setup -q %patch0 -p0 %build %if 0%{?mandriva_version} #XXX something wents wrong with detecting this export PTHREAD_LIBS=-lpthread %endif %configure --disable-static %{__make} %{?jobs:-j%jobs} # %if %{with protobuf_java} pushd java ../src/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto %__mkdir classes %if 0%{?suse_version} == 1110 # 11.1 only workaround # http://en.opensuse.org/Java/Packaging/Cookbook#bytecode_version_error extra_java_flags="-target 1.5" %endif javac $extra_java_flags -d classes src/main/java/com/google/protobuf/*.java sed -e 's/@VERSION@/%version/' < %{SOURCE1} > manifest.txt jar cfm %{name}-java-%{version}.jar manifest.txt -C classes com popd %endif # %if %{with protobuf_python} pushd python %__python setup.py build popd %endif %if %{with check} %check %{__make} check %{?jobs:-j%jobs} %endif %install %makeinstall %__install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto.vim # no need for that /bin/rm %{buildroot}%{_libdir}/*.la # %if %{with protobuf_java} pushd java %__install -D -m 0644 %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java-%{version}.jar %__ln_s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java.jar %__ln_s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar popd %endif # %if %{with protobuf_python} pushd python %__python setup.py install --skip-build \ --prefix=%{_prefix} \ --install-data=%{_datadir} \ --root %{buildroot} \ --record-rpm=INSTALLED_FILES popd %endif # %if 0%{?suse_version} > 1010 %fdupes %{buildroot}%{py_sitedir}/%{name}-%{version}-py%{py_ver}.egg-info %endif %clean rm -rf $RPM_BUILD_ROOT; %post -n libprotobuf%{soname} -p /sbin/ldconfig %postun -n libprotobuf%{soname} -p /sbin/ldconfig %post -n libprotoc%{soname} -p /sbin/ldconfig %postun -n libprotoc%{soname} -p /sbin/ldconfig %post -n libprotobuf-lite%{soname} -p /sbin/ldconfig %postun -n libprotobuf-lite%{soname} -p /sbin/ldconfig %files -n libprotobuf%{soname} %defattr(-, root, root) %{_libdir}/libprotobuf.so.%{soname}* %files -n libprotoc%{soname} %defattr(-, root, root) %{_libdir}/libprotoc.so.%{soname}* %files -n libprotobuf-lite%{soname} %defattr(-, root, root) %{_libdir}/libprotobuf-lite.so.%{soname}* %files devel %defattr(-,root,root) %doc COPYING.txt %doc CHANGES.txt CONTRIBUTORS.txt README.txt %doc examples %{_bindir}/protoc %{_includedir}/google %{_libdir}/*.so %{_libdir}/pkgconfig/* %{_datadir}/vim %if %{with protobuf_java} %files -n %{name}-java %defattr(-,root,root) %{_javadir}/protobuf* %endif %if %{with protobuf_python} %files -n python-%{name} -f python/INSTALLED_FILES %defattr(-,root,root) %endif %changelog ++++++ baselibs.conf ++++++ libprotobuf5 libprotobuf-lite5 libprotoc5 ++++++ manifest.txt.in ++++++ Manifest-Version: 1.0 Created-By: stick(a)gk2.sk Name: com/google/protobuf/ Specification-Title: Google Protocol Buffers Specification-Version: @VERSION@ Specification-Vendor: stick(a)gk2.sk Implementation-Title: com.google.protobuf Implementation-Version: @VERSION@ Implementation-Vendor: stick(a)gk2.sk ++++++ protobuf-setuptools-2.2.0.patch ++++++ python tries to auto download a newer version ... o_O --- python/ez_setup.py +++ python/ez_setup.py @@ -19,7 +19,7 @@ This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c9" +DEFAULT_VERSION = "0.6c8" DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit beaver for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package beaver for openSUSE:Factory checked in at Wed May 5 23:39:06 CEST 2010. -------- --- beaver/beaver.changes 2009-12-12 16:27:56.000000000 +0100 +++ beaver/beaver.changes 2010-05-04 16:09:32.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 4 16:07:50 CEST 2010 - meissner(a)suse.de + +- disable strip --strip-all (to generate debuginfos) +- fix voidreturn warning +- add missing ; to desktop file + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- beaver-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beaver.spec ++++++ --- /var/tmp/diff_new_pack.9rL8uG/_old 2010-05-05 23:37:57.000000000 +0200 +++ /var/tmp/diff_new_pack.9rL8uG/_new 2010-05-05 23:37:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package beaver (Version 0.4.0rc1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,7 +21,7 @@ Name: beaver Summary: Beaver is an Early AdVanced EditoR. Beaver is based on GTK+2 Version: 0.4.0rc1 -Release: 1 +Release: 2 License: GPLv2 Group: System/GUI/GNOME Url: http://www.nongnu.org/beaver/index.html @@ -29,6 +29,7 @@ Patch0: beaver-makefile.patch Patch1: beaver-no-return.patch Patch2: beaver-gcc-warns.patch +Patch3: beaver-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake fdupes gcc gcc-c++ make BuildRequires: doxygen gtk2-devel pkg-config @@ -46,13 +47,14 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build ./autogen.sh export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %configure -%__make %{?jobs:-j%{jobs}} +%__make V=1 %{?jobs:-j%{jobs}} %__make doc %install ++++++ beaver-desktop.patch ++++++ Index: beaver0.4.0/beaver.desktop =================================================================== --- beaver0.4.0.orig/beaver.desktop +++ beaver0.4.0/beaver.desktop @@ -13,7 +13,7 @@ Comment=Beaver's an Early AdVanced Edito Exec=DESTDIR/bin/beaver %F Terminal=false Icon=beaver -MimeType=text/* +MimeType=text/*; StartupNotify=false #StartupWMClass=beaver ++++++ beaver-makefile.patch ++++++ --- /var/tmp/diff_new_pack.9rL8uG/_old 2010-05-05 23:37:57.000000000 +0200 +++ /var/tmp/diff_new_pack.9rL8uG/_new 2010-05-05 23:37:57.000000000 +0200 @@ -1,7 +1,8 @@ -diff -uNr old-beaver0.4.0//Makefile.am beaver0.4.0//Makefile.am ---- old-beaver0.4.0//Makefile.am 2009-10-01 18:59:20.000000000 +0200 -+++ beaver0.4.0//Makefile.am 2009-10-01 19:01:42.000000000 +0200 -@@ -39,10 +39,10 @@ +Index: beaver0.4.0/Makefile.am +=================================================================== +--- beaver0.4.0.orig/Makefile.am ++++ beaver0.4.0/Makefile.am +@@ -39,10 +39,10 @@ clean-local: install-doc: if HAS_DOXYGEN if test -d $(srcdir)/doc/html; then \ @@ -14,7 +15,7 @@ fi \ done \ fi -@@ -53,20 +53,20 @@ +@@ -53,20 +53,20 @@ install-data-local: install-doc # plugins/mkmakefile.sh @@ -45,7 +46,7 @@ if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ -@@ -82,11 +82,11 @@ +@@ -82,11 +82,11 @@ install-data-local: install-doc $(INSTALL_DATA) resource/beaver.conf.default $(DESTDIR)$(pkgdatadir)/resource $(INSTALL_DATA) resource/wordfile.default $(DESTDIR)$(pkgdatadir)/resource @@ -61,12 +62,39 @@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/include $(INSTALL_DATA) plugins/Makefile $(DESTDIR)$(pkgdatadir)/include/Makefile -@@ -97,7 +97,7 @@ +@@ -97,7 +97,6 @@ install-data-local: install-doc if DEBUG @echo "" else - $(STRIP) --strip-all $(bindir)/beaver$(EXEEXT) -+ $(STRIP) --strip-all $(DESTDIR)$(bindir)/beaver$(EXEEXT) endif uninstall: +Index: beaver0.4.0/src/Makefile.am +=================================================================== +--- beaver0.4.0.orig/src/Makefile.am ++++ beaver0.4.0/src/Makefile.am +@@ -24,8 +24,7 @@ THE_LAST_VAR__=1 + #if PRINT_LESS_OUTPUT + + .c.o: +- @echo " [CC] "$< +- @$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + + .c.obj: +Index: beaver0.4.0/src/api/Makefile.am +=================================================================== +--- beaver0.4.0.orig/src/api/Makefile.am ++++ beaver0.4.0/src/api/Makefile.am +@@ -19,8 +19,7 @@ THE_LAST_VAR__=1 + #if PRINT_LESS_OUTPUT + + .c.o: +- @echo " [CC] api/"$< +- @$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + + .c.obj: ++++++ beaver-no-return.patch ++++++ --- /var/tmp/diff_new_pack.9rL8uG/_old 2010-05-05 23:37:57.000000000 +0200 +++ /var/tmp/diff_new_pack.9rL8uG/_new 2010-05-05 23:37:57.000000000 +0200 @@ -1,7 +1,37 @@ -diff -uNr old-beaver0.4.0//src/prefs.c beaver0.4.0//src/prefs.c ---- old-beaver0.4.0//src/prefs.c 2009-08-16 19:04:39.000000000 +0200 -+++ beaver0.4.0//src/prefs.c 2009-10-25 16:39:15.705468435 +0100 -@@ -441,7 +441,7 @@ +Index: beaver0.4.0/src/interface.c +=================================================================== +--- beaver0.4.0.orig/src/interface.c ++++ beaver0.4.0/src/interface.c +@@ -1482,7 +1482,7 @@ static gboolean expose_event (GtkWidget + /* only draw if the user wants to */ + if (!MARKER) + { +- return; ++ return FALSE; + } + + GdkRectangle visible_rect; +Index: beaver0.4.0/src/prefs.c +=================================================================== +--- beaver0.4.0.orig/src/prefs.c ++++ beaver0.4.0/src/prefs.c +@@ -28,6 +28,7 @@ + * + */ + ++#include <string.h> + #include <gtk/gtk.h> + #include "struct.h" + #include "prefs.h" +@@ -52,6 +53,7 @@ t_settings init_settings (void) + { + t_settings set; + ++ memset (&set, 0, sizeof(set)); + set.recent_files = get_int_conf ("General/RecentFiles/MaxNb"); + set.recent_files = MIN (set.recent_files, MAX_POSSIBLE_RECENT_FILES); + set.main_window_size_autosave = get_bool_conf ("General/Window/Autosave"); +@@ -441,7 +443,7 @@ static inline pref_tab_editor (t_setting gtk_spin_button_set_value (GTK_SPIN_BUTTON (button), settings->tab_width); g_signal_connect (G_OBJECT (button), "value-changed", (GtkSignalFunc) signal_tab_width, NULL); @@ -10,7 +40,7 @@ } /** -@@ -600,6 +600,7 @@ +@@ -600,6 +602,7 @@ static inline pref_tab_general (t_settin /* append a new page to the notebook */ gtk_notebook_append_page (GTK_NOTEBOOK (pref_notebook), box, gtk_label_new ("General")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bickley for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package bickley for openSUSE:Factory checked in at Wed May 5 23:37:44 CEST 2010. -------- --- bickley/bickley.changes 2010-02-03 19:53:07.000000000 +0100 +++ bickley/bickley.changes 2010-05-05 11:44:01.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 5 11:43:40 CEST 2010 - meissner(a)suse.de + +- fixed a void return warning +- removed unnecessary rpmlintrc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bickley-rpmlintrc New: ---- bickley-fixvoidreturn.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bickley.spec ++++++ --- /var/tmp/diff_new_pack.OR3Hih/_old 2010-05-05 23:36:39.000000000 +0200 +++ /var/tmp/diff_new_pack.OR3Hih/_new 2010-05-05 23:36:39.000000000 +0200 @@ -23,13 +23,13 @@ Group: Productivity/Multimedia/Other %define actual_version 0.4.4 Version: 0.5.0.4.4 -Release: 1 +Release: 2 License: LGPLv2.1 Url: http://moblin.org/ Source0: %{name}-%{actual_version}.tar.bz2 -Source1: %{name}-rpmlintrc Patch0: bickley-version-hacks.patch Patch1: bickley-audio-cover-thumbnail.patch +Patch2: bickley-fixvoidreturn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel clutter-gst-devel dbus-1-glib-devel glib2-devel gstreamer-0_10-devel gtk-doc gtk2-devel libexif-devel libgupnp-devel BuildRequires: flac-devel gconf2-devel libgupnp-av-devel libid3tag-devel libogg-devel libsoup-devel libtdb-devel libvorbis-devel @@ -72,6 +72,7 @@ %setup -q -n %{name}-%{actual_version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build ./autogen.sh ++++++ bickley-fixvoidreturn.patch ++++++ Index: bickley-0.4.4/tests/test-db-crash.c =================================================================== --- bickley-0.4.4.orig/tests/test-db-crash.c +++ bickley-0.4.4/tests/test-db-crash.c @@ -31,7 +31,7 @@ main (int argc, if (!db) { g_printerr ("Could not get music database: %s\n", error->message); g_error_free (error); - return 0; + return 1; } for (i = 0; i < N_FIELDS; i++) { @@ -49,7 +49,7 @@ main (int argc, if (!kozo_db_add (db, "test-key", l, &error)) { g_print ("Error adding entry: %s\n", error->message); g_error_free (error); - return; + return 1; } return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dalston for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package dalston for openSUSE:Factory checked in at Wed May 5 23:36:29 CEST 2010. -------- --- dalston/dalston.changes 2010-04-27 07:48:15.000000000 +0200 +++ dalston/dalston.changes 2010-05-05 16:52:53.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 5 16:52:20 CEST 2010 - meissner(a)suse.de + +- fixed several implicit functions, by including string.h + and also by adding prototypes to respective headers + in dalston-brightness-osd.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dalston.spec ++++++ --- /var/tmp/diff_new_pack.RSKDjT/_old 2010-05-05 23:35:17.000000000 +0200 +++ /var/tmp/diff_new_pack.RSKDjT/_new 2010-05-05 23:35:17.000000000 +0200 @@ -22,7 +22,7 @@ Summary: System information icons Group: System/GUI/Other Version: 0.1.11 -Release: 1 +Release: 2 License: LGPLv2.0+ Url: http://moblin.org/ Source0: %{name}-%{version}.tar.bz2 ++++++ dalston-brightness-osd.diff ++++++ --- /var/tmp/diff_new_pack.RSKDjT/_old 2010-05-05 23:35:17.000000000 +0200 +++ /var/tmp/diff_new_pack.RSKDjT/_new 2010-05-05 23:35:17.000000000 +0200 @@ -29,7 +29,7 @@ + gint brightness; + + if (!priv->panel_proxy) -+ return; ++ return 0; + + hal_panel_proxy_get_brightness (priv->panel_proxy, + &brightness, @@ -112,6 +112,18 @@ DalstonBrightnessManager *dalston_brightness_manager_dup_singleton (void); +@@ -70,7 +72,10 @@ void dalston_brightness_manager_maximise + void dalston_brightness_manager_increase (DalstonBrightnessManager *manager); + void dalston_brightness_manager_decrease (DalstonBrightnessManager *manager); + ++gint dalston_brightness_manager_get_brightness_sync (DalstonBrightnessManager *manager); ++gboolean dalston_brightness_manager_brightness_in_hardware (DalstonBrightnessManager *manager); ++ ++ + G_END_DECLS + + #endif /* _DALSTON_BRIGHTNESS_MANAGER */ +- Index: dalston-0.1.11/dalston/dalston-brightness-slider.c =================================================================== --- dalston-0.1.11.orig/dalston/dalston-brightness-slider.c @@ -152,7 +164,7 @@ =================================================================== --- /dev/null +++ dalston-0.1.11/dalston/gpm-popup-window.c -@@ -0,0 +1,1035 @@ +@@ -0,0 +1,1036 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2006-2007 William Jon McCann <mccann(a)jhu.edu> @@ -177,6 +189,7 @@ + +#include <math.h> +#include <glib.h> ++#include <string.h> +#include <gtk/gtk.h> + +#include "gpm-popup-window.h" @@ -1192,7 +1205,7 @@ =================================================================== --- /dev/null +++ dalston-0.1.11/dalston/gpm-popup-window.h -@@ -0,0 +1,66 @@ +@@ -0,0 +1,79 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2006 William Jon McCann <mccann(a)jhu.edu> @@ -1256,6 +1269,19 @@ +void gpm_popup_window_set_value (GpmPopupWindow *popup, + gint value); +gboolean gpm_popup_window_is_valid (GpmPopupWindow *window); ++void gpm_popup_window_set_draw_osd_box (GpmPopupWindow *window, ++ gboolean draw_osd_box_in); ++void gpm_popup_window_set_osd_window_size (GpmPopupWindow *window, ++ int osd_window_size_in); ++void gpm_popup_window_set_cust_theme (GpmPopupWindow *window, ++ GtkIconTheme *cust_theme_in); ++void gpm_popup_window_set_osd_render_finish (GpmPopupWindow *window, ++ gboolean *osd_render_finish_in); ++void gpm_popup_window_set_num_levels (GpmPopupWindow *popup, gint num_levels); ++void gpm_popoup_window_set_action (GpmPopupWindow *window, GpmPopupWindowAction action); ++void gpm_popup_window_set_battery_percentage (GpmPopupWindow *popup, gint battery_percentage_in); ++ ++ +G_END_DECLS + +#endif @@ -1991,7 +2017,7 @@ =================================================================== --- /dev/null +++ dalston-0.1.11/dalston/dalston-brightness-button-monitor.h -@@ -0,0 +1,68 @@ +@@ -0,0 +1,71 @@ +/* + * Dalston - power and volume applets for Moblin + * Copyright (C) 2009, Intel Corporation. @@ -2056,6 +2082,9 @@ + +DalstonBrightnessButtonMonitor *dalston_brightness_button_monitor_new (DalstonBrightnessManager *brightness_manager); + ++void dalston_brightness_button_monitor_set_battery_percentage (DalstonBrightnessButtonMonitor *monitor, gint battery_percentage_in); ++ ++ +G_END_DECLS + +#endif /* _DALSTON_BRIGHTNESS_BUTTON_MONITOR */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit exiftool for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package exiftool for openSUSE:Factory checked in at Wed May 5 23:35:02 CEST 2010. -------- --- exiftool/exiftool.changes 2009-08-06 14:47:11.000000000 +0200 +++ exiftool/exiftool.changes 2010-05-02 01:50:56.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 2 01:47:18 CEST 2010 - postadal(a)suse.cz + +- updated to version 8.15 + * added new camera formats, lenses, gps + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Image-ExifTool-7.82.tar.bz2 New: ---- Image-ExifTool-8.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exiftool.spec ++++++ --- /var/tmp/diff_new_pack.SPzEB0/_old 2010-05-05 23:34:13.000000000 +0200 +++ /var/tmp/diff_new_pack.SPzEB0/_new 2010-05-05 23:34:13.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package exiftool (Version 7.82) +# spec file for package exiftool (Version 8.15) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,12 +19,12 @@ Name: exiftool -License: Artistic License .. ; GPL v2 or later +License: Artistic License .. ; GPLv2+ Group: Productivity/Graphics/Other Requires: perl = %{perl_version} AutoReqProv: on Summary: A Highly Customizable Perl Script for Reading and Writing Meta Information in Files -Version: 7.82 +Version: 8.15 Release: 1 Source: Image-ExifTool-%{version}.tar.bz2 Url: http://www.sno.phy.queensu.ca/~phil/exiftool/ ++++++ Image-ExifTool-7.82.tar.bz2 -> Image-ExifTool-8.15.tar.bz2 ++++++ ++++ 143511 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kaffeine for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kaffeine for openSUSE:Factory checked in at Wed May 5 23:34:02 CEST 2010. -------- --- KDE/kaffeine/kaffeine.changes 2010-03-21 22:15:01.000000000 +0100 +++ kaffeine/kaffeine.changes 2010-04-14 15:20:35.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 14 13:14:00 UTC 2010 - llunak(a)novell.com + +- support for on-demand codecs install using ksuseinstall + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ksuseinstall.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.WxFqnX/_old 2010-05-05 23:30:25.000000000 +0200 +++ /var/tmp/diff_new_pack.WxFqnX/_new 2010-05-05 23:30:25.000000000 +0200 @@ -20,19 +20,20 @@ Name: kaffeine BuildRequires: libkdepimlibs4-devel -BuildRequires: xine-devel +BuildRequires: libksuseinstall-devel xine-devel Url: http://kaffeine.sourceforge.net/ License: GPLv2+ Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.9+1.0pre3 -Release: 2 +Release: 3 %define rversion 1.0-pre3 # http://kaffeine.kde.org/?q=node/22 Source0: kaffeine-%rversion.tar.gz Source1: kaffeine-icons.tar.bz2 Patch1: fix_plasma_startup_error.diff Patch2: kaffeine-1.0-pre3-include_mkfifo.patch +Patch3: ksuseinstall.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libqt4-sql-sqlite %kde4_runtime_requires @@ -54,6 +55,7 @@ %setup -q -n kaffeine-%rversion -b 1 %patch1 %patch2 +%patch3 %build %cmake_kde4 -d build ++++++ ksuseinstall.diff ++++++ --- src/CMakeLists.txt.sav 2010-01-31 18:04:50.000000000 +0100 +++ src/CMakeLists.txt 2010-04-14 14:26:48.125514619 +0200 @@ -43,6 +43,7 @@ configure_file(config-kaffeine.h.cmake $ kde4_add_executable(kaffeine ${kaffeine_SRCS}) target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) +target_link_libraries(kaffeine ksuseinstall) install(TARGETS kaffeine ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES scanfile.dvb DESTINATION ${DATA_INSTALL_DIR}/kaffeine) install(FILES kaffeine.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) --- src/backend-xine/xinecommands.h.sav 2010-04-14 14:02:32.000000000 +0200 +++ src/backend-xine/xinecommands.h 2010-04-14 14:04:17.590512647 +0200 @@ -59,7 +59,8 @@ namespace XineCommands UpdateAngles = 11, UpdateMouseTracking = 12, UpdateMouseCursor = 13, - UpdateVideoSize = 14 + UpdateVideoSize = 14, + SupportedMimeTypes = 15 }; }; @@ -351,6 +352,13 @@ public: reinterpret_cast<const char *>(&videoSize), sizeof(videoSize)); } + void supportedMimeTypes(const QString& mime) + { + writer->write(XineCommands::SupportedMimeTypes, + reinterpret_cast<const char *>(mime.constData()), + static_cast<unsigned int>(mime.size()) * sizeof(QChar)); + } + XinePipeWriterBase *writer; }; --- src/backend-xine/xinemediawidget.cpp.sav 2010-04-14 14:02:32.000000000 +0200 +++ src/backend-xine/xinemediawidget.cpp 2010-04-14 14:38:25.957512431 +0200 @@ -22,13 +22,17 @@ #include "xinemediawidget_p.h" #include <QResizeEvent> +#include <QTimer> #include <KDebug> +#include <KLocale> #include <KMessageBox> #include <KUrl> #include <config-kaffeine.h> #include <errno.h> #include <unistd.h> +#include <ksuseinstall.h> + static QString binInstallPath() { return QString::fromUtf8(KAFFEINE_BIN_INSTALL_DIR "/"); @@ -214,6 +218,15 @@ void XineProcess::readyRead() break; } + case XineCommands::SupportedMimeTypes: { + QString mime = reader->readString(); + + if (reader->isValid()) { + parent->supportedMimeTypes(mime); + } + + break; + } default: kError() << "unknown command" << command; continue; @@ -795,6 +808,45 @@ void XineMediaWidget::updateVideoSize(un } } +void XineMediaWidget::supportedMimeTypes(const QString &mime) +{ + // This is a bit lame, but simply check for a mimetype that the crippled package + // does not provide. + foreach( const QString& item, mime.split( ';' )) { + QStringList fields = item.split( ':' ); + if( fields.count() == 3 ) { + if( fields.first() == "audio/mp3" ) { + return; // ok + } + } + } + QTimer::singleShot( 0, this, SLOT( installAdditionalCodecs())); +} + +void XineMediaWidget::installAdditionalCodecs() +{ + KGuiItem installGuiItem( KStandardGuiItem::yes()); + installGuiItem.setText( i18nc( "@action:button", "Install" )); + if( KMessageBox::warningContinueCancel( window(), + i18n( "Kaffeine currently cannot play some file formats. Do you want to install additional support?" ), + i18n( "Install Additional Codecs" ), + installGuiItem, KStandardGuiItem::no(), "suse_additional_codecs" ) != KMessageBox::Continue ) + { + return; + } + if( KSUSEInstall::installCapabilities( QStringList() << "libxine1-codecs", + KSUSEInstall::FullInstallRequired, window())) + { // TODO use the items + KGuiItem restartNowGuiItem( KStandardGuiItem::yes()); + restartNowGuiItem.setText( i18nc( "@action:button", "Restart Now" )); + KGuiItem restartLaterGuiItem( KStandardGuiItem::no()); + restartLaterGuiItem.setText( i18nc( "@action:button", "Restart Later" )); + KMessageBox::information( window(), + i18n( "The necessary support has been successfully installed." + " It may be necessary to restart the application for the support to be activated." )); + } +} + void XineMediaWidget::playEncodedUrl(const QByteArray &encodedUrl, StateFlags stateFlags) { ++sequenceNumber; --- src/backend-xine/xinemediawidget.h.sav 2010-01-31 18:04:50.000000000 +0100 +++ src/backend-xine/xinemediawidget.h 2010-04-14 14:31:17.301512132 +0200 @@ -127,6 +127,9 @@ public: Q_DECLARE_FLAGS(DirtyFlags, DirtyFlag) +private slots: + void installAdditionalCodecs(); + private: void mouseMoveEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event); @@ -149,6 +152,7 @@ private: void updateMouseTracking(bool mouseTrackingEnabled); void updateMouseCursor(bool pointingMouseCursor); void updateVideoSize(unsigned int videoSize_); + void supportedMimeTypes(const QString &mime); void playEncodedUrl(const QByteArray &encodedUrl, StateFlags stateFlags = 0); void stateChanged(); --- src/backend-xine/xineapplication.cpp.sav 2010-04-14 14:02:32.000000000 +0200 +++ src/backend-xine/xineapplication.cpp 2010-04-14 14:38:37.521511436 +0200 @@ -292,6 +292,10 @@ void XineObject::init(quint64 windowId) QFile::encodeName(KStandardDirs::locateLocal("data", "kaffeine/xine-config"))); xine_init(engine); + if( char* mimes = xine_get_mime_types( engine )) { + parentProcess->supportedMimeTypes( mimes ); + } + QVector<const char *> audioDrivers; audioDrivers.append("auto"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kcm_gtk for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kcm_gtk for openSUSE:Factory checked in at Wed May 5 23:30:14 CEST 2010. -------- --- KDE/kcm_gtk/kcm_gtk.changes 2009-04-28 13:36:51.000000000 +0200 +++ kcm_gtk/kcm_gtk.changes 2010-04-30 15:49:02.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 30 12:51:47 UTC 2010 - llunak(a)novell.com + +- make the default gtk style work out of the box +- make Oxygen-molecule the default gtk style + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtkrc-2.0-kde4.template kcm_gtk.suse.sh work-by-default.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_gtk.spec ++++++ --- /var/tmp/diff_new_pack.8kDCQg/_old 2010-05-05 23:28:51.000000000 +0200 +++ /var/tmp/diff_new_pack.8kDCQg/_new 2010-05-05 23:28:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kcm_gtk (Version 1.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -23,17 +23,20 @@ %if %suse_version == 1100 BuildRequires: kdesdk4-scripts %endif -License: GPL v2 or later +License: GPLv2+ Url: http://www.freedesktop.org/Software/gtk-qt Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE control module for switching GTK+ style Version: 1.1 -Release: 2 +Release: 3 Source: gtk-qt-engine-%{version}.tar.bz2 +Source2: kcm_gtk.suse.sh +Source3: gtkrc-2.0-kde4.template Patch: build-only-kcm.diff Patch1: icon-location.diff Patch2: insertCatalog.diff +Patch3: work-by-default.diff Provides: kde4-kcm_gtk = 1.1 Obsoletes: kde4-kcm_gtk <= 1.1 @@ -52,6 +55,7 @@ %patch %patch1 %patch2 +%patch3 %build %cmake_kde4 @@ -63,6 +67,10 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/services mv $RPM_BUILD_ROOT/usr/share/applications/kde4/kcmgtk4.desktop $RPM_BUILD_ROOT/usr/share/kde4/services/ %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/kde4/services/kcmgtk4.desktop + mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/env + install -D -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/share/kde4/env/ + mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps/kcm_gtk/ + install -D -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/kde4/apps/kcm_gtk/ %post -p /sbin/ldconfig @@ -77,5 +85,8 @@ %_kde4_modules/kcm_gtk4.so %_kde_share_dir/services/kcmgtk4.desktop /usr/share/icons/hicolor/48x48/apps/kcmgtk.png +%dir /usr/share/kde4/env +/usr/share/kde4/env/kcm_gtk.suse.sh +/usr/share/kde4/apps/kcm_gtk %changelog ++++++ gtkrc-2.0-kde4.template ++++++ # This file was written by KDE # You can edit it in the KDE control center, under "GTK Styles and Fonts" include "/usr/share/themes/@@THEME_NAME@@/gtk-2.0/gtkrc" include "/etc/gtk-2.0/gtkrc" style "user-font" { font_name="Sans Serif" } widget_class "*" style "user-font" gtk-theme-name="@@THEME_NAME@@" gtk-font-name="Sans Serif 9" ++++++ kcm_gtk.suse.sh ++++++ #!/bin/bash # Defaults for openSUSE 10.3 GTK2_SYSCONFDIR=/etc GTK2_DATADIR=/usr/share/themes/ # file used by kcm_gtk GTK2_THEME_RC="$HOME/.gtkrc-2.0-kde4" # GTK2 # NOTE: ~/.gtkrc-2.0-kde is added later (in latest KDE only) if [ "$GTK2_RC_FILES" ]; then export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0" else export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0" fi # create the file if it doesn't exit if [ ! -e "$GTK2_THEME_RC" ]; then # oxygen-molecule, the default if [ -e "$GTK2_DATADIR/Oxygen-Molecule/gtk-2.0/gtkrc" ] ; then THEME="Oxygen-Molecule" elif [ -e "$GTK2_DATADIR/QtCurve/gtk-2.0/gtkrc" ] ; then # use QtCurve engine THEME="QtCurve" elif [ -e "$GTK2_DATADIR/Qt/gtk-2.0/gtkrc" ] ; then # use general gtk-qt-engine THEME="Qt" fi if [ -n "$THEME" ]; then cp -f /usr/share/kde4/apps/kcm_gtk/gtkrc-2.0-kde4.template "$GTK2_THEME_RC" sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK2_THEME_RC" fi fi ++++++ work-by-default.diff ++++++ Subject: Make the selected style work by default From: Lubos Lunak Patch-upstream: no Relates: kcm_gtk.suse.sh, gtkrc-2.0-kde4.template In order to make the selected Gtk theme work by default we have system-wide kcm_gtk.suse.sh instead of using kcm_gtk's gtk-qt-engine.rc.sh that kcm_gtk would otherwise install after first configuration save. Our script creates ~/.gtkrc-2.0-kde4 with proper defaults if not existing and does the Gtk theming setup that used to be in startkde.suse.sh. --- kcm_gtk/kcmgtk.cpp.sav 2008-03-11 02:30:19.000000000 +0100 +++ kcm_gtk/kcmgtk.cpp 2010-04-30 14:45:28.520928763 +0200 @@ -115,6 +115,9 @@ void KcmGtk::save() // Write ~/.gtkrc-2.0-kde4 m_gtkRc->save(); + if( !QFile::exists( "/usr/share/kde4/env/kcm_gtk.suse.sh")) + { + // Write ~/.kde/env/gtk-qt-engine.rc.sh bool envFileDidNotExist = !QFile::exists(k_envFileName); @@ -137,6 +140,8 @@ void KcmGtk::save() if (envFileDidNotExist) QMessageBox::information(this, "Restart KDE", "Your changes have been saved, but you will have to restart KDE for them to take effect.", QMessageBox::Ok); + } // end of /usr/share/kde4/env/... + // Write the KDE paths to a config file that gets picked up by the theme engine // It used to popen kde-config, but that broke sometimes and seemed ugly QSettings settings("gtk-qt-engine", "gtk-qt-engine"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-l10n for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kde4-l10n for openSUSE:Factory checked in at Wed May 5 23:28:27 CEST 2010. -------- --- KDE/kde4-l10n/kde4-l10n.changes 2010-03-29 09:56:04.000000000 +0200 +++ kde4-l10n/kde4-l10n.changes 2010-04-30 09:26:49.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 29 22:22:50 CEST 2010 - dmueller(a)suse.de + +- update to 4.4.3 + * bugfixes over 4.4.2 + * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kde-l10n-ar-4.4.2.tar.bz2 kde-l10n-bg-4.4.2.tar.bz2 kde-l10n-ca-4.4.2.tar.bz2 kde-l10n-ca(a)valencia-4.4.2.tar.bz2 kde-l10n-cs-4.4.2.tar.bz2 kde-l10n-csb-4.4.2.tar.bz2 kde-l10n-da-4.4.2.tar.bz2 kde-l10n-de-4.4.2.tar.bz2 kde-l10n-el-4.4.2.tar.bz2 kde-l10n-en_GB-4.4.2.tar.bz2 kde-l10n-eo-4.4.2.tar.bz2 kde-l10n-es-4.4.2.tar.bz2 kde-l10n-et-4.4.2.tar.bz2 kde-l10n-eu-4.4.2.tar.bz2 kde-l10n-fi-4.4.2.tar.bz2 kde-l10n-fr-4.4.2.tar.bz2 kde-l10n-fy-4.4.2.tar.bz2 kde-l10n-ga-4.4.2.tar.bz2 kde-l10n-gl-4.4.2.tar.bz2 kde-l10n-gu-4.4.2.tar.bz2 kde-l10n-he-4.4.2.tar.bz2 kde-l10n-hi-4.4.2.tar.bz2 kde-l10n-hr-4.4.2.tar.bz2 kde-l10n-hu-4.4.2.tar.bz2 kde-l10n-id-4.4.2.tar.bz2 kde-l10n-is-4.4.2.tar.bz2 kde-l10n-it-4.4.2.tar.bz2 kde-l10n-ja-4.4.2.tar.bz2 kde-l10n-kk-4.4.2.tar.bz2 kde-l10n-km-4.4.2.tar.bz2 kde-l10n-kn-4.4.2.tar.bz2 kde-l10n-ko-4.4.2.tar.bz2 kde-l10n-lt-4.4.2.tar.bz2 kde-l10n-lv-4.4.2.tar.bz2 kde-l10n-mai-4.4.2.tar.bz2 kde-l10n-mk-4.4.2.tar.bz2 kde-l10n-ml-4.4.2.tar.bz2 kde-l10n-nb-4.4.2.tar.bz2 kde-l10n-nds-4.4.2.tar.bz2 kde-l10n-nl-4.4.2.tar.bz2 kde-l10n-nn-4.4.2.tar.bz2 kde-l10n-pa-4.4.2.tar.bz2 kde-l10n-pl-4.4.2.tar.bz2 kde-l10n-pt-4.4.2.tar.bz2 kde-l10n-pt_BR-4.4.2.tar.bz2 kde-l10n-ro-4.4.2.tar.bz2 kde-l10n-ru-4.4.2.tar.bz2 kde-l10n-si-4.4.2.tar.bz2 kde-l10n-sk-4.4.2.tar.bz2 kde-l10n-sl-4.4.2.tar.bz2 kde-l10n-sr-4.4.2.tar.bz2 kde-l10n-sv-4.4.2.tar.bz2 kde-l10n-tg-4.4.2.tar.bz2 kde-l10n-tr-4.4.2.tar.bz2 kde-l10n-uk-4.4.2.tar.bz2 kde-l10n-wa-4.4.2.tar.bz2 kde-l10n-zh_CN-4.4.2.tar.bz2 kde-l10n-zh_TW-4.4.2.tar.bz2 New: ---- kde-l10n-ar-4.4.3.tar.bz2 kde-l10n-bg-4.4.3.tar.bz2 kde-l10n-ca-4.4.3.tar.bz2 kde-l10n-ca(a)valencia-4.4.3.tar.bz2 kde-l10n-cs-4.4.3.tar.bz2 kde-l10n-csb-4.4.3.tar.bz2 kde-l10n-da-4.4.3.tar.bz2 kde-l10n-de-4.4.3.tar.bz2 kde-l10n-el-4.4.3.tar.bz2 kde-l10n-en_GB-4.4.3.tar.bz2 kde-l10n-eo-4.4.3.tar.bz2 kde-l10n-es-4.4.3.tar.bz2 kde-l10n-et-4.4.3.tar.bz2 kde-l10n-eu-4.4.3.tar.bz2 kde-l10n-fi-4.4.3.tar.bz2 kde-l10n-fr-4.4.3.tar.bz2 kde-l10n-fy-4.4.3.tar.bz2 kde-l10n-ga-4.4.3.tar.bz2 kde-l10n-gl-4.4.3.tar.bz2 kde-l10n-gu-4.4.3.tar.bz2 kde-l10n-he-4.4.3.tar.bz2 kde-l10n-hi-4.4.3.tar.bz2 kde-l10n-hr-4.4.3.tar.bz2 kde-l10n-hu-4.4.3.tar.bz2 kde-l10n-id-4.4.3.tar.bz2 kde-l10n-is-4.4.3.tar.bz2 kde-l10n-it-4.4.3.tar.bz2 kde-l10n-ja-4.4.3.tar.bz2 kde-l10n-kk-4.4.3.tar.bz2 kde-l10n-km-4.4.3.tar.bz2 kde-l10n-kn-4.4.3.tar.bz2 kde-l10n-ko-4.4.3.tar.bz2 kde-l10n-lt-4.4.3.tar.bz2 kde-l10n-lv-4.4.3.tar.bz2 kde-l10n-mai-4.4.3.tar.bz2 kde-l10n-mk-4.4.3.tar.bz2 kde-l10n-ml-4.4.3.tar.bz2 kde-l10n-nb-4.4.3.tar.bz2 kde-l10n-nds-4.4.3.tar.bz2 kde-l10n-nl-4.4.3.tar.bz2 kde-l10n-nn-4.4.3.tar.bz2 kde-l10n-pa-4.4.3.tar.bz2 kde-l10n-pl-4.4.3.tar.bz2 kde-l10n-pt-4.4.3.tar.bz2 kde-l10n-pt_BR-4.4.3.tar.bz2 kde-l10n-ro-4.4.3.tar.bz2 kde-l10n-ru-4.4.3.tar.bz2 kde-l10n-si-4.4.3.tar.bz2 kde-l10n-sk-4.4.3.tar.bz2 kde-l10n-sl-4.4.3.tar.bz2 kde-l10n-sr-4.4.3.tar.bz2 kde-l10n-sv-4.4.3.tar.bz2 kde-l10n-tg-4.4.3.tar.bz2 kde-l10n-tr-4.4.3.tar.bz2 kde-l10n-uk-4.4.3.tar.bz2 kde-l10n-wa-4.4.3.tar.bz2 kde-l10n-zh_CN-4.4.3.tar.bz2 kde-l10n-zh_TW-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-l10n.spec ++++++ --- /var/tmp/diff_new_pack.gkDf9y/_old 2010-05-05 23:24:08.000000000 +0200 +++ /var/tmp/diff_new_pack.gkDf9y/_new 2010-05-05 23:24:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-l10n (Version 4.4.2) +# spec file for package kde4-l10n (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ License: GPLv2+ Group: System/Localization Summary: English translations for KDE -Version: 4.4.2 +Version: 4.4.3 Release: 1 %define kdepim_version %version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1121,14 +1121,14 @@ echo "%dir /usr/share/locale/hne/LC_MESSAGES" fi - if test "$i" = "sr@ijekavian" -a %suse_version -lt 1140; then - echo "%dir /usr/share/locale/sr@ijekavian" - echo "%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES" - fi - if test "$i" = "sr@ijekavianlatin" -a %suse_version -lt 1140; then - echo "%dir /usr/share/locale/sr@ijekavianlatin" - echo "%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES" - fi +# if test "$i" = "sr@ijekavian" -a %suse_version -lt 1140; then +# echo "%dir /usr/share/locale/sr@ijekavian" +# echo "%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES" +# fi +# if test "$i" = "sr@ijekavianlatin" -a %suse_version -lt 1140; then +# echo "%dir /usr/share/locale/sr@ijekavianlatin" +# echo "%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES" +# fi } >> files.$l { ++++++ kde-l10n-ar-4.4.2.tar.bz2 -> kde-l10n-ar-4.4.3.tar.bz2 ++++++ ++++ 9555 lines of diff (skipped) ++++++ kde-l10n-bg-4.4.2.tar.bz2 -> kde-l10n-bg-4.4.3.tar.bz2 ++++++ ++++ 9441 lines of diff (skipped) ++++++ kde-l10n-ca-4.4.2.tar.bz2 -> kde-l10n-ca-4.4.3.tar.bz2 ++++++ ++++ 11284 lines of diff (skipped) ++++++ kde-l10n-ca(a)valencia-4.4.2.tar.bz2 -> kde-l10n-ca(a)valencia-4.4.3.tar.bz2 ++++++ ++++ 12354 lines of diff (skipped) ++++++ kde-l10n-cs-4.4.2.tar.bz2 -> kde-l10n-cs-4.4.3.tar.bz2 ++++++ ++++ 15428 lines of diff (skipped) ++++++ kde-l10n-csb-4.4.2.tar.bz2 -> kde-l10n-csb-4.4.3.tar.bz2 ++++++ ++++ 3584 lines of diff (skipped) ++++++ kde-l10n-da-4.4.2.tar.bz2 -> kde-l10n-da-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-da-4.4.2.tar.bz2 kde4-l10n/kde-l10n-da-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-de-4.4.2.tar.bz2 -> kde-l10n-de-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-de-4.4.2.tar.bz2 kde4-l10n/kde-l10n-de-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-el-4.4.2.tar.bz2 -> kde-l10n-el-4.4.3.tar.bz2 ++++++ ++++ 11339 lines of diff (skipped) ++++++ kde-l10n-en_GB-4.4.2.tar.bz2 -> kde-l10n-en_GB-4.4.3.tar.bz2 ++++++ ++++ 9555 lines of diff (skipped) ++++++ kde-l10n-eo-4.4.2.tar.bz2 -> kde-l10n-eo-4.4.3.tar.bz2 ++++++ ++++ 9442 lines of diff (skipped) ++++++ kde-l10n-es-4.4.2.tar.bz2 -> kde-l10n-es-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-es-4.4.2.tar.bz2 kde4-l10n/kde-l10n-es-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-et-4.4.2.tar.bz2 -> kde-l10n-et-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-et-4.4.2.tar.bz2 kde4-l10n/kde-l10n-et-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-eu-4.4.2.tar.bz2 -> kde-l10n-eu-4.4.3.tar.bz2 ++++++ ++++ 9526 lines of diff (skipped) ++++++ kde-l10n-fi-4.4.2.tar.bz2 -> kde-l10n-fi-4.4.3.tar.bz2 ++++++ ++++ 45573 lines of diff (skipped) ++++++ kde-l10n-fr-4.4.2.tar.bz2 -> kde-l10n-fr-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-fr-4.4.2.tar.bz2 kde4-l10n/kde-l10n-fr-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-fy-4.4.2.tar.bz2 -> kde-l10n-fy-4.4.3.tar.bz2 ++++++ ++++ 7355 lines of diff (skipped) ++++++ kde-l10n-ga-4.4.2.tar.bz2 -> kde-l10n-ga-4.4.3.tar.bz2 ++++++ ++++ 143093 lines of diff (skipped) ++++++ kde-l10n-gl-4.4.2.tar.bz2 -> kde-l10n-gl-4.4.3.tar.bz2 ++++++ ++++ 9523 lines of diff (skipped) ++++++ kde-l10n-gu-4.4.2.tar.bz2 -> kde-l10n-gu-4.4.3.tar.bz2 ++++++ ++++ 2965 lines of diff (skipped) ++++++ kde-l10n-he-4.4.2.tar.bz2 -> kde-l10n-he-4.4.3.tar.bz2 ++++++ ++++ 12355 lines of diff (skipped) ++++++ kde-l10n-hi-4.4.2.tar.bz2 -> kde-l10n-hi-4.4.3.tar.bz2 ++++++ ++++ 9183 lines of diff (skipped) ++++++ kde-l10n-hr-4.4.2.tar.bz2 -> kde-l10n-hr-4.4.3.tar.bz2 ++++++ ++++ 21379 lines of diff (skipped) ++++++ kde-l10n-hu-4.4.2.tar.bz2 -> kde-l10n-hu-4.4.3.tar.bz2 ++++++ ++++ 64643 lines of diff (skipped) ++++++ kde-l10n-id-4.4.2.tar.bz2 -> kde-l10n-id-4.4.3.tar.bz2 ++++++ ++++ 2126 lines of diff (skipped) ++++++ kde-l10n-is-4.4.2.tar.bz2 -> kde-l10n-is-4.4.3.tar.bz2 ++++++ ++++ 17360 lines of diff (skipped) ++++++ kde-l10n-it-4.4.2.tar.bz2 -> kde-l10n-it-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-it-4.4.2.tar.bz2 kde4-l10n/kde-l10n-it-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-ja-4.4.2.tar.bz2 -> kde-l10n-ja-4.4.3.tar.bz2 ++++++ ++++ 12465 lines of diff (skipped) ++++++ kde-l10n-kk-4.4.2.tar.bz2 -> kde-l10n-kk-4.4.3.tar.bz2 ++++++ ++++ 23043 lines of diff (skipped) ++++++ kde-l10n-km-4.4.2.tar.bz2 -> kde-l10n-km-4.4.3.tar.bz2 ++++++ ++++ 9382 lines of diff (skipped) ++++++ kde-l10n-kn-4.4.2.tar.bz2 -> kde-l10n-kn-4.4.3.tar.bz2 ++++++ ++++ 1752 lines of diff (skipped) ++++++ kde-l10n-ko-4.4.2.tar.bz2 -> kde-l10n-ko-4.4.3.tar.bz2 ++++++ ++++ 8978 lines of diff (skipped) ++++++ kde-l10n-lt-4.4.2.tar.bz2 -> kde-l10n-lt-4.4.3.tar.bz2 ++++++ ++++ 40158 lines of diff (skipped) ++++++ kde-l10n-lv-4.4.2.tar.bz2 -> kde-l10n-lv-4.4.3.tar.bz2 ++++++ ++++ 9530 lines of diff (skipped) ++++++ kde-l10n-mai-4.4.2.tar.bz2 -> kde-l10n-mai-4.4.3.tar.bz2 ++++++ ++++ 4464 lines of diff (skipped) ++++++ kde-l10n-mk-4.4.2.tar.bz2 -> kde-l10n-mk-4.4.3.tar.bz2 ++++++ ++++ 9132 lines of diff (skipped) ++++++ kde-l10n-ml-4.4.2.tar.bz2 -> kde-l10n-ml-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-ml-4.4.2.tar.bz2 kde4-l10n/kde-l10n-ml-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-nb-4.4.2.tar.bz2 -> kde-l10n-nb-4.4.3.tar.bz2 ++++++ ++++ 18120 lines of diff (skipped) ++++++ kde-l10n-nds-4.4.2.tar.bz2 -> kde-l10n-nds-4.4.3.tar.bz2 ++++++ ++++ 14630 lines of diff (skipped) ++++++ kde-l10n-nl-4.4.2.tar.bz2 -> kde-l10n-nl-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-nl-4.4.2.tar.bz2 kde4-l10n/kde-l10n-nl-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-nn-4.4.2.tar.bz2 -> kde-l10n-nn-4.4.3.tar.bz2 ++++++ ++++ 15267 lines of diff (skipped) ++++++ kde-l10n-pa-4.4.2.tar.bz2 -> kde-l10n-pa-4.4.3.tar.bz2 ++++++ ++++ 9422 lines of diff (skipped) ++++++ kde-l10n-pl-4.4.2.tar.bz2 -> kde-l10n-pl-4.4.3.tar.bz2 ++++++ ++++ 12869 lines of diff (skipped) ++++++ kde-l10n-pt-4.4.2.tar.bz2 -> kde-l10n-pt-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-pt-4.4.2.tar.bz2 kde4-l10n/kde-l10n-pt-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-pt_BR-4.4.2.tar.bz2 -> kde-l10n-pt_BR-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-pt_BR-4.4.2.tar.bz2 kde4-l10n/kde-l10n-pt_BR-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-ro-4.4.2.tar.bz2 -> kde-l10n-ro-4.4.3.tar.bz2 ++++++ ++++ 9455 lines of diff (skipped) ++++++ kde-l10n-ru-4.4.2.tar.bz2 -> kde-l10n-ru-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-ru-4.4.2.tar.bz2 kde4-l10n/kde-l10n-ru-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-si-4.4.2.tar.bz2 -> kde-l10n-si-4.4.3.tar.bz2 ++++++ ++++ 3545 lines of diff (skipped) ++++++ kde-l10n-sk-4.4.2.tar.bz2 -> kde-l10n-sk-4.4.3.tar.bz2 ++++++ ++++ 9683 lines of diff (skipped) ++++++ kde-l10n-sl-4.4.2.tar.bz2 -> kde-l10n-sl-4.4.3.tar.bz2 ++++++ ++++ 13984 lines of diff (skipped) ++++++ kde-l10n-sr-4.4.2.tar.bz2 -> kde-l10n-sr-4.4.3.tar.bz2 ++++++ ++++ 246776 lines of diff (skipped) ++++++ kde-l10n-sv-4.4.2.tar.bz2 -> kde-l10n-sv-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-sv-4.4.2.tar.bz2 kde4-l10n/kde-l10n-sv-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-tg-4.4.2.tar.bz2 -> kde-l10n-tg-4.4.3.tar.bz2 ++++++ ++++ 9141 lines of diff (skipped) ++++++ kde-l10n-tr-4.4.2.tar.bz2 -> kde-l10n-tr-4.4.3.tar.bz2 ++++++ ++++ 36959 lines of diff (skipped) ++++++ kde-l10n-uk-4.4.2.tar.bz2 -> kde-l10n-uk-4.4.3.tar.bz2 ++++++ KDE/kde4-l10n/kde-l10n-uk-4.4.2.tar.bz2 kde4-l10n/kde-l10n-uk-4.4.3.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-wa-4.4.2.tar.bz2 -> kde-l10n-wa-4.4.3.tar.bz2 ++++++ ++++ 8463 lines of diff (skipped) ++++++ kde-l10n-zh_CN-4.4.2.tar.bz2 -> kde-l10n-zh_CN-4.4.3.tar.bz2 ++++++ ++++ 10157 lines of diff (skipped) ++++++ kde-l10n-zh_TW-4.4.2.tar.bz2 -> kde-l10n-zh_TW-4.4.3.tar.bz2 ++++++ ++++ 10087 lines of diff (skipped) ++++++ kde4-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.gkDf9y/_old 2010-05-05 23:25:21.000000000 +0200 +++ /var/tmp/diff_new_pack.gkDf9y/_new 2010-05-05 23:25:21.000000000 +0200 @@ -27,7 +27,7 @@ License: GPL v2 or later Group: System/Localization Summary: English translations for KDE -Version: 4.4.2 +Version: 4.4.3 Release: 1 %define kdepim_version %version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -197,14 +197,14 @@ echo "%dir /usr/share/locale/hne/LC_MESSAGES" fi - if test "$i" = "sr@ijekavian" -a %suse_version -lt 1140; then - echo "%dir /usr/share/locale/sr@ijekavian" - echo "%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES" - fi - if test "$i" = "sr@ijekavianlatin" -a %suse_version -lt 1140; then - echo "%dir /usr/share/locale/sr@ijekavianlatin" - echo "%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES" - fi +# if test "$i" = "sr@ijekavian" -a %suse_version -lt 1140; then +# echo "%dir /usr/share/locale/sr@ijekavian" +# echo "%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES" +# fi +# if test "$i" = "sr@ijekavianlatin" -a %suse_version -lt 1140; then +# echo "%dir /usr/share/locale/sr@ijekavianlatin" +# echo "%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES" +# fi } >> files.$l { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0