May 2010 - openSUSE Commits - openSUSE Mailing Lists

drop beagle-index from openSUSE:Factory
by root＠hilbert.suse.de 31 May '10

31 May '10

Hello community, FYI: Package beagle-index was dropped from openSUSE:Factory at Mon May 31 18:10:30 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=be… 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

drop perl-Filter from openSUSE:Factory
by root＠hilbert.suse.de 31 May '10

31 May '10

Hello community, FYI: Package perl-Filter was dropped from openSUSE:Factory at Mon May 31 18:10:10 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=pe… 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

drop yast2-system-profile from openSUSE:Factory
by root＠hilbert.suse.de 31 May '10

31 May '10

Hello community, FYI: Package yast2-system-profile was dropped from openSUSE:Factory at Mon May 31 18:09:18 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ya… 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 OpenOffice_org-icon-themes for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-icon-themes for openSUSE:Factory checked in at Mon May 31 01:02:26 CEST 2010. -------- --- OpenOffice_org-icon-themes/OpenOffice_org-icon-themes.changes 2010-05-13 21:44:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-icon-themes/OpenOffice_org-icon-themes.changes 2010-05-28 17:58:51.000000000 +0200 @@ -1,0 +2,10 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to version 3.2.1.3 + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to version 3.2.1.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.YTCOdn/_old 2010-05-31 01:02:06.000000000 +0200 +++ /var/tmp/diff_new_pack.YTCOdn/_new 2010-05-31 01:02:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-icon-themes (Version 3.2.1.1) +# spec file for package OpenOffice_org-icon-themes (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-icon-themes -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 BuildRequires: OpenOffice_org-icon-themes-prebuilt = %version %define ooo_basis_dir basis3.2 %define ooo_home ooo3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-extensions for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-extensions for openSUSE:Factory checked in at Mon May 31 01:02:26 CEST 2010. -------- --- OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2010-05-13 21:44:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2010-05-28 17:58:22.000000000 +0200 @@ -1,0 +2,21 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) +- removed WatchWindow extension; was not mature enough (bnc#604638) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) +- added missing sources for the GDocs extension (bnc#590838) + +------------------------------------------------------------------- +Tue May 18 17:34:37 CEST 2010 - pmladek(a)suse.cz + +- fixed build on MeeGo: + + added ant-nodeps into BuildRequires + + saved mysqlc source directory + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- WatchWindow_1.1.2.oxt WatchWindow_1.1.2.tar.bz2 ooo320-m17-extensions.tar.bz2 New: ---- AbsoluteLayout.tar.bz2 mail-1.4-sources.jar ooo320-m19-extensions.tar.bz2 swing-layout-1.0.4-doc.zip swing-layout-1.0.4-src.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-extensions.spec ++++++ --- /var/tmp/diff_new_pack.RxSGC3/_old 2010-05-31 01:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.RxSGC3/_new 2010-05-31 01:02:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-extensions (Version 3.2.1.1) +# spec file for package OpenOffice_org-extensions (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,18 +19,17 @@ Name: OpenOffice_org-extensions -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece extensions %define ct2n_version 1.3.2 %define gdocs_version 2.1.0 %define numbertext_version 0.8.2 -%define watchwidnow_version 1.1.2 #!BuildIgnore: OpenOffice_org -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp ant-nodeps bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip %if 0%{?suse_version} -BuildRequires: ant-nodeps db-devel kdelibs3-devel krb5 openldap2-devel python-xml xorg-x11 +BuildRequires: db-devel kdelibs3-devel krb5 openldap2-devel python-xml xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel @@ -61,7 +60,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: GPLv2 ; LGPLv2.1+ ; LGPLv3 ; Other uncritical OpenSource License Group: Productivity/Office/Suite AutoReqProv: on @@ -75,11 +74,25 @@ # prebuilt extensions Source100: gdocs_%{gdocs_version}_modified.oxt Source101: numbertext-%{numbertext_version}.oxt -Source102: WatchWindow_%{watchwidnow_version}.oxt # FIXME: this is just because of license; we do not build gdocs from sources now +# gdocs sources Source500: gdocs_%{gdocs_version}.tar.bz2 Source501: gdocs_%{gdocs_version}.diff -Source502: WatchWindow_%{watchwidnow_version}.tar.bz2 +# gdata-*.jar and google-*.jar are under Apache License, Version 2.0 +# activation.jar is part of "JavaTM Web Services Developer Pack 1.5 Release +# Notes" and is mentioned there between "Redistributable Components", see +# http://java.sun.com/webservices/docs/1.5/ReleaseNotes.html#RedistributableC… +# mail-1.4-sources.jar is taken from http://ftp.us.xemacs.org/pub/mirrors/maven2/javax/mail/mail/1.4/ +# the mail-1.4.jar in the above URL is not exactly the same but it is evident that it is built from the same sources: +# class files are exactly the same; sligtly newer ant and Sun JRE has been used for the build; +# text files has DOS end of lines +Source502: mail-1.4-sources.jar +# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh +Source503: AbsoluteLayout.tar.bz2 +# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh +Source504: swing-layout-1.0.4-doc.zip +# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh +Source505: swing-layout-1.0.4-src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -164,7 +177,6 @@ - Convert Text to Number - New Functions NUMBERTEXT and MONEYTEXT - Solver for Nonlinear Programming -- Watch Window %package -n OpenOffice_org-draw-extensions License: LGPLv3 @@ -321,7 +333,6 @@ yes yes | LANG=EN_US.UTF-8 unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/ConvertTextToNumber-%{ct2n_version}.oxt || true; unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/NLPSolver.oxt || true; unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/numbertext-%{numbertext_version}.oxt || true; -unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/WatchWindow_%{watchwidnow_version}.oxt || true; %preun -n OpenOffice_org-calc-extensions if test $1 = 0 ; then @@ -329,7 +340,6 @@ unopkg remove --shared "nl.nouenoff.ct2n" || true; unopkg remove --shared "com.sun.star.comp.Calc.NLPSolver" || true; unopkg remove --shared "org.numbertext-calc-addin" || true; - unopkg remove --shared "org.openoffice.extensions.watchwindow.WatchWindow" || true; # clear disk cache unopkg list --shared > /dev/null 2>&1 || true fi @@ -411,6 +421,12 @@ %setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo +# we do not want to build mysql on Meego +%if 0%{?meego_version} +mkdir -p ooo-build/ooo/do-not-build +mv mysqlc ooo-build/ooo/do-not-build +%endif +# README-scsolver.txt cp %{S:2} . # nlpsolver stuff mkdir -p nlpsolver/download @@ -436,7 +452,6 @@ # prebuilt extensions cp %{S:100} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install cp %{S:101} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install -cp %{S:102} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install # unpack the mysql extension on newer distros %if 0%{?suse_version} >= 01120 cd $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install/ @@ -471,7 +486,6 @@ %ooo_prefix/%ooo_home/share/extension/install/ConvertTextToNumber-%{ct2n_version}.oxt %ooo_prefix/%ooo_home/share/extension/install/NLPSolver.oxt %ooo_prefix/%ooo_home/share/extension/install/numbertext-%{numbertext_version}.oxt -%ooo_prefix/%ooo_home/share/extension/install/WatchWindow_%{watchwidnow_version}.oxt %files -n OpenOffice_org-draw-extensions %defattr(-,root,root) ++++++ ooo320-m17-extensions.tar.bz2 -> ooo320-m19-extensions.tar.bz2 ++++++ OpenOffice_org-extensions/ooo320-m17-extensions.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-extensions/ooo320-m19-extensions.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-l10n for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-l10n for openSUSE:Factory checked in at Mon May 31 01:01:36 CEST 2010. -------- --- OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2010-05-13 21:45:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2010-05-28 17:59:00.000000000 +0200 @@ -1,0 +2,10 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to version 3.2.1.3 + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to version 3.2.1.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-l10n.spec ++++++ --- /var/tmp/diff_new_pack.7l9hfe/_old 2010-05-31 01:01:30.000000000 +0200 +++ /var/tmp/diff_new_pack.7l9hfe/_new 2010-05-31 01:01:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-l10n (Version 3.2.1.1) +# spec file for package OpenOffice_org-l10n (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: OpenOffice_org-l10n -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 %define piece l10n -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 anjuta-extras for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package anjuta-extras for openSUSE:Factory checked in at Mon May 31 01:00:51 CEST 2010. -------- --- GNOME/anjuta-extras/anjuta-extras.changes 2010-05-26 10:19:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/anjuta-extras/anjuta-extras.changes 2010-05-28 21:32:19.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 28 19:18:08 UTC 2010 - dimstar(a)opensuse.org + +- Drop anuta-extras-rpmlintrc, fixed by upstream; the plugins + properly are linked with -avoid-version -module. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- anjuta-extras-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta-extras.spec ++++++ --- /var/tmp/diff_new_pack.nsUlxw/_old 2010-05-31 01:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.nsUlxw/_new 2010-05-31 01:00:46.000000000 +0200 @@ -21,12 +21,11 @@ Name: anjuta-extras Summary: Extra plugins for anjuta Version: 2.30.1.0 -Release: 1 +Release: 2 License: GPLv2+ Group: Development/Tools/IDE Url: http://download.gnome.org/sources/anjuta-extras Source: %{name}-%{version}.tar.bz2 -Source99: %{name}-rpmlintrc BuildRequires: anjuta-devel BuildRequires: binutils-devel BuildRequires: gcc-c++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lxde-common-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package lxde-common-branding-openSUSE for openSUSE:Factory checked in at Mon May 31 01:00:42 CEST 2010. -------- --- lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes 2010-05-18 10:27:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes 2010-05-30 14:49:05.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 30 12:49:41 UTC 2010 - andrea(a)opensuse.org + +- updated suse-logout.png to fit 11.3 branding + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxde-common-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.7OufBd/_old 2010-05-31 01:00:36.000000000 +0200 +++ /var/tmp/diff_new_pack.7OufBd/_new 2010-05-31 01:00:36.000000000 +0200 @@ -20,7 +20,7 @@ Name: lxde-common-branding-openSUSE Version: 11.3 -Release: 5 +Release: 6 License: GPL Source0: lxde-common-0.5.0.tar.bz2 Source1: suse.png ++++++ suse-logout.png ++++++ Files lxde-common-branding-openSUSE/suse-logout.png and /mounts/work_src_done/STABLE/lxde-common-branding-openSUSE/suse-logout.png differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lxmenu-data for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package lxmenu-data for openSUSE:Factory checked in at Mon May 31 01:00:30 CEST 2010. -------- --- lxmenu-data/lxmenu-data.changes 2010-05-14 16:37:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxmenu-data/lxmenu-data.changes 2010-05-29 18:04:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 29 16:05:39 UTC 2010 - andrea(a)opensuse.org + +- added lxmenu-data-0.1.1-fix-translations.patch to + fix translations + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lxmenu-data-0.1.1-fix-translations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxmenu-data.spec ++++++ --- /var/tmp/diff_new_pack.z9yDqz/_old 2010-05-31 01:00:26.000000000 +0200 +++ /var/tmp/diff_new_pack.z9yDqz/_new 2010-05-31 01:00:26.000000000 +0200 @@ -20,12 +20,15 @@ Name: lxmenu-data Version: 0.1.1 -Release: 2 +Release: 3 License: GPL Source0: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE lxmenu-data-0.1.1-menu-customization.patch -- Guido Berhörster guido+opensuse.org(a)berhoerster.name # Clean up lxde menu and improve user experience -Patch0: %{name}-0.1.1-menu-customization.patch +Patch0: %name-0.1.1-menu-customization.patch +# PATCH-FIX-UPSTREAM lxmenu-data-0.1.1-fix-translations.patch -- Andrea Florio andrea(a)opensuse.org +# fix POTFILES.in to generate working po files +Patch1: %name-0.1.1-fix-translations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc gettext-tools perl perl-XML-Parser pkgconfig BuildRequires: autoconf automake intltool @@ -44,8 +47,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +cd po +intltool-update -r +cd .. export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %configure ++++++ lxmenu-data-0.1.1-fix-translations.patch ++++++ diff -uNr old-lxmenu-data-0.1.1//po/POTFILES.in lxmenu-data-0.1.1/po/POTFILES.in --- old-lxmenu-data-0.1.1//po/POTFILES.in 2009-02-09 01:29:54.000000000 +0100 +++ lxmenu-data-0.1.1/po/POTFILES.in 2010-05-29 18:03:19.725874865 +0200 @@ -14,7 +14,6 @@ desktop-directories/lxde-office.directory.in desktop-directories/lxde-other.directory.in desktop-directories/lxde-personal.directory.in -desktop-directories/lxde-science.directory.in desktop-directories/lxde-settings.directory.in desktop-directories/lxde-settings-system.directory.in desktop-directories/lxde-system.directory.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 30 May '10

30 May '10

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at Mon May 31 01:00:25 CEST 2010. -------- --- mariadb/mariadb.changes 2010-04-30 14:29:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/mariadb/mariadb.changes 2010-05-26 11:54:09.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 25 14:44:15 CEST 2010 - mhrusecky(a)suse.cz + +- updated to MariaDB 5.1.44b + - important security related update + - changelog: + http://askmonty.org/wiki/Manual:MariaDB_5.1.44b_Release_Notes +- not obsoleting mysql, to make sure mysql gets replaced by + mysql-community-server by default + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mariadb-5.1.44.tar.bz2 New: ---- mariadb-5.1.44b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.Kh3tO0/_old 2010-05-31 01:00:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Kh3tO0/_new 2010-05-31 01:00:16.000000000 +0200 @@ -32,12 +32,12 @@ Name: mariadb Summary: A True Multiuser, Multithreaded SQL Database Server Version: 5.1.44 -Release: 1 +Release: 2 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com # http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from… -Source: mariadb-%{version}.tar.bz2 +Source: mariadb-%{version}b.tar.bz2 Source2: baselibs.conf Source3: README.debug Source4: suse-test-run @@ -112,9 +112,7 @@ %endif # required by rcmysql Requires: %{name}-client perl-base -Obsoletes: mysql-Max < %{srv_vers} Provides: mysql-Max = %{srv_vers} -Obsoletes: mysql < %{srv_vers} Provides: mysql = %{srv_vers} Conflicts: otherproviders(mysql) @@ -167,7 +165,6 @@ #------------------------------------------------------------------------------- # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release -Obsoletes: mysql-devel < %srv_vers Requires: libmysqlclient16 = %srv_vers libmysqlclient_r16 = %srv_vers glibc-devel zlib-devel openssl-devel Summary: MariaDB Development Header Files and Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -252,7 +249,6 @@ Summary: MariaDB Client Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} -Obsoletes: mysql-client < %{srv_vers} Conflicts: otherproviders(mysql-client) %description client @@ -272,7 +268,6 @@ Summary: MariaDB - Benchmarks Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} -Obsoletes: mysql-bench < %{srv_vers} Conflicts: otherproviders(mysql-bench) %description bench @@ -294,7 +289,6 @@ Group: Productivity/Databases/Servers Requires: %{name} = %{srv_vers} Provides: mysql-debug = %{srv_vers} -Obsoletes: mysql-debug < %{srv_vers} Conflicts: otherproviders(mysql-debug) %description debug @@ -322,7 +316,6 @@ Requires: %{name}-tools = %{srv_vers} Requires: %{name}-bench = %{srv_vers} Provides: mysql-test = %{srv_vers} -Obsoletes: mysql-test < %{srv_vers} Conflicts: otherproviders(mysql-test) %description test @@ -346,7 +339,6 @@ # make sure this package is installed when updating from 10.2 and older Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror Provides: mysql-tools = %{srv_vers} -Obsoletes: mysql-tools < %{srv_vers} Conflicts: otherproviders(mysql-tools) %description tools @@ -367,7 +359,6 @@ Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} -Obsoletes: mysql-ndb-storage < %{srv_vers} Conflicts: otherproviders(mysql-ndb-storage) %description ndb-storage @@ -383,7 +374,6 @@ Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} -Obsoletes: mysql-ndb-management < %{srv_vers} Conflicts: otherproviders(mysql-ndb-management) %description ndb-management @@ -399,7 +389,6 @@ Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} -Obsoletes: mysql-ndb-tools < %{srv_vers} Conflicts: otherproviders(mysql-ndb-tools) %description ndb-tools @@ -413,7 +402,6 @@ Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers} -Obsoletes: mysql-ndb-extra < %{srv_vers} Conflicts: otherproviders(mysql-ndb-extra) %description ndb-extra @@ -425,7 +413,7 @@ %prep #------------------------------------------------------------------------------- -%setup -q -n mariadb-%version +%setup -q -n mariadb-%{version}b cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . %patch2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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