March 2011 - openSUSE Commits - openSUSE Mailing Lists

commit evolution-sharp for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package evolution-sharp for openSUSE:Factory checked in at Thu Mar 31 10:38:27 CEST 2011. -------- --- GNOME/evolution-sharp/evolution-sharp.changes 2010-09-28 23:19:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-sharp/evolution-sharp.changes 2011-03-21 17:58:21.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 21 16:58:21 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- +Fri Feb 18 02:07:04 CET 2011 - vuntz(a)opensuse.org + +- Update evolution-sharp-newer-evo.patch so that the 2.91/2.92 + compatibility doesn't break the 2.32 build. + +------------------------------------------------------------------- +Thu Jan 20 12:20:04 UTC 2011 - fcrozat(a)novell.com + +- Update evolution-sharp-newer-evo.patch to fix build with + evolution 2.91.x + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-sharp.spec ++++++ --- /var/tmp/diff_new_pack.t8HHHa/_old 2011-03-31 10:25:50.000000000 +0200 +++ /var/tmp/diff_new_pack.t8HHHa/_new 2011-03-31 10:25:50.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package evolution-sharp (Version 0.21.1) +# spec file for package evolution-sharp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,13 +23,12 @@ BuildRequires: glib-sharp2 BuildRequires: gtk-sharp2 BuildRequires: gtk-sharp2-gapi -BuildRequires: licenses BuildRequires: mono-devel License: GPLv2+ Group: Productivity/Networking/Email/Clients Requires: mono Version: 0.21.1 -Release: 11 +Release: 15 Summary: Mono Bindings for Evolution Url: http://gnome.org/projects/evolution/ Source: http://ftp.gnome.org/pub/gnome/sources/evolution-sharp/0.17/%{name}-%{versi… @@ -38,7 +37,6 @@ # PATCH-FIX-UPSTREAM task-field-changes.diff bgo583866 Patch2: task-field-changes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses Provides: %{name}-devel = %{version}-%{release} %description @@ -63,7 +61,6 @@ %install %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/*.*a -ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -rf $RPM_BUILD_ROOT ++++++ evolution-sharp-newer-evo.patch ++++++ --- /var/tmp/diff_new_pack.t8HHHa/_old 2011-03-31 10:25:50.000000000 +0200 +++ /var/tmp/diff_new_pack.t8HHHa/_new 2011-03-31 10:25:50.000000000 +0200 @@ -2,14 +2,55 @@ =================================================================== --- evolution-sharp-0.21.1.orig/configure.in +++ evolution-sharp-0.21.1/configure.in -@@ -16,8 +16,8 @@ fi +@@ -16,8 +16,9 @@ fi PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no])) PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no])) PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no])) -PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27.4, edsver="2.24", AC_MSG_RESULT([no])) -PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27.4, edsver="unsupported", AC_MSG_RESULT([no])) +PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.33.0, edsver="2.24", AC_MSG_RESULT([no])) -+PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.33.0, edsver="unsupported", AC_MSG_RESULT([no])) ++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_92, evolution-data-server-1.2 >= 2.91.1 evolution-data-server-1.2 < 2.93.0, edsver="2.92", AC_MSG_RESULT([no])) ++PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.93.0, edsver="unsupported", AC_MSG_RESULT([no])) if test "x$edsver" = "x1.8"; then EDS_VERSION=-1.2 +@@ -39,6 +40,13 @@ elif test "x$edsver" = "x2.24"; then + ECAL_SOVERSION=7 + EBACKEND_SOVERSION=0 + EDATACAL_SOVERSION=6 ++elif test "x$edsver" = "x2.92"; then ++ EDS_VERSION=-1.2 ++ EDS_SOVERSION=11 ++ EBOOK_SOVERSION=9 ++ ECAL_SOVERSION=8 ++ EBACKEND_SOVERSION=1 ++ EDATACAL_SOVERSION=11 + elif test "x$edsver" = "xunsupported"; then + AC_MSG_ERROR([ + +@@ -87,6 +95,7 @@ AM_CONDITIONAL(USE_EDS_1_8, test "x$edsv + AM_CONDITIONAL(USE_EDS_1_9, test "x$edsver" = "x1.9") + AM_CONDITIONAL(USE_EDS_1_10, test "x$edsver" = "x1.10") + AM_CONDITIONAL(USE_EDS_2_24, test "x$edsver" = "x2.24") ++AM_CONDITIONAL(USE_EDS_2_92, test "x$edsver" = "x2.92") + + PKG_CHECK_MODULES(MONO, mono >= 1.0.0) + AC_PATH_PROG(CSC, mcs, no) +Index: evolution-sharp-0.21.1/evolution/Makefile.am +=================================================================== +--- evolution-sharp-0.21.1.orig/evolution/Makefile.am ++++ evolution-sharp-0.21.1/evolution/Makefile.am +@@ -25,6 +25,13 @@ SOURCES_2_24 = src/CalComponentDateTime. + CSFLAGS = -define:USE_EDS_2_24 + endif + ++if USE_EDS_2_92 ++RAW_API = evolution-api.raw ++CUSTOMS_2_24 = Icaltimetype.custom CalBackend.custom CalBackendCache.custom CalBackendSExp.custom ++SOURCES_2_24 = src/CalComponentDateTime.cs src/CalCompChanges.cs ++CSFLAGS = -define:USE_EDS_2_24 ++endif ++ + API=evolution-api.xml + METADATA = Evolution.metadata + ASSEMBLY_NAME = evolution-sharp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Thu Mar 31 10:25:30 CEST 2011. -------- --- xorg-x11-server/xorg-x11-server.changes 2011-03-17 18:02:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2011-03-25 04:34:07.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 25 03:20:58 UTC 2011 - sndirsch(a)novell.com + +- EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch + * EXA/mixed: ModifyPixmapHeader pitch fixes. (bnc #678264, + bfo #33929) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.3tjZxd/_old 2011-03-31 10:15:59.000000000 +0200 +++ /var/tmp/diff_new_pack.3tjZxd/_new 2011-03-31 10:15:59.000000000 +0200 @@ -32,7 +32,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} -Release: 19 +Release: 20 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -124,6 +124,7 @@ Patch225: xorg-server-stop-cpu-eating.diff Patch226: record-avoid-crash-when-calling-RecordFlushReplyBuff.patch Patch227: Replace-malloc-with-calloc-to-initialize-the-buffers.patch +Patch228: EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch %if %moblin Patch300: moblin-use_preferred_mode_for_all_outputs.diff %endif @@ -259,6 +260,7 @@ %patch225 -p1 %patch226 -p1 %patch227 -p1 +%patch228 -p1 %if %moblin %patch300 -p1 %endif ++++++ EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch ++++++ >From 7b3b7efe78dec87c8059ea0d0985f08a97f0633d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer(a)vmware.com> Date: Thu, 24 Feb 2011 12:17:57 +0100 Subject: [PATCH] EXA/mixed: ModifyPixmapHeader pitch fixes. (bug #33929) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there's a GPU copy and a non-zero devKind was passed in, set the GPU copy pitch to that instead of to a possibly bogus value derived from the new width. This is e.g. used by the radeon driver's drmmode_xf86crtc_resize hook, fixes https://bugs.freedesktop.org/show_bug.cgi?id=33929 . On the other hand, the system memory copy doesn't need the pitch to be aligned beyond the PixmapBytePad of the width. Signed-off-by: Michel Dänzer <daenzer(a)vmware.com> Acked-by: Cyril Brulebois <kibi(a)debian.org> Tested-by: Cyril Brulebois <kibi(a)debian.org> Reported-by: Thierry Vignaud <thierry.vignaud(a)gmail.com> Tested-by: Thierry Vignaud <thierry.vignaud(a)gmail.com> Signed-off-by: Keith Packard <keithp(a)keithp.com> (cherry picked from commit 31704510f448706524b7b7085cc4ff0ada7bfe7e) --- exa/exa_mixed.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index 606f1e1..fd1afb2 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -175,8 +175,10 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, depth != pPixmap->drawable.depth || bitsPerPixel != pPixmap->drawable.bitsPerPixel) { if (pExaPixmap->driverPriv) { - exaSetFbPitch(pExaScr, pExaPixmap, - width, height, bitsPerPixel); + if (devKind > 0) + pExaPixmap->fb_pitch = devKind; + else + exaSetFbPitch(pExaScr, pExaPixmap, width, height, bitsPerPixel); exaSetAccelBlock(pExaScr, pExaPixmap, width, height, bitsPerPixel); @@ -187,8 +189,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, if (has_gpu_copy && pExaPixmap->sys_ptr) { free(pExaPixmap->sys_ptr); pExaPixmap->sys_ptr = NULL; - pExaPixmap->sys_pitch = devKind > 0 ? devKind : - PixmapBytePad(width, depth); + pExaPixmap->sys_pitch = PixmapBytePad(width, depth); DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage); DamageDestroy(pExaPixmap->pDamage); pExaPixmap->pDamage = NULL; -- 1.7.4.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 gnome-panel for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package gnome-panel for openSUSE:Factory checked in at Thu Mar 31 10:15:33 CEST 2011. -------- --- GNOME/gnome-panel/gnome-panel.changes 2011-02-17 19:51:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2011-03-21 17:42:02.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:41:34 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.BnGWic/_old 2011-03-31 10:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.BnGWic/_new 2011-03-31 10:03:32.000000000 +0200 @@ -19,7 +19,7 @@ Name: gnome-panel Version: 2.32.1 -Release: 9 +Release: 10 License: GPLv2+ Summary: The GNOME Desktop Panel Url: http://www.gnome.org @@ -55,7 +55,6 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: licenses BuildRequires: pkg-config BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -83,7 +82,6 @@ BuildRequires: pkgconfig(xau) # Needed for the clock applet Requires: gnome-settings-daemon-polkit-datetime -Requires: licenses # Required by clock/tz.c: Requires: timezone Recommends: %{name}-lang @@ -263,12 +261,6 @@ sed -i /GCONF_CONFIG_SOURCE/d %{name}.schemas_posttrans # Move .entries file to /usr/share/gconf/schemas, see fate#305318 mv %{buildroot}%{_sysconfdir}/gconf/schemas/panel-default-setup.entries %{buildroot}%{_datadir}/GConf/schemas/panel-default-setup.entries -for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//g') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %fdupes %{buildroot} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 usbmuxd for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package usbmuxd for openSUSE:Factory checked in at Thu Mar 31 10:03:11 CEST 2011. -------- --- usbmuxd/usbmuxd.changes 2010-12-09 01:05:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/usbmuxd/usbmuxd.changes 2011-03-24 17:51:17.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 24 17:45:01 CEST 2011 - opensuse(a)sukimashita.com + +- Create and use "usbmux" user in %pre to fix bno#679159 + +------------------------------------------------------------------- +Thu Mar 24 11:25:01 CEST 2011 - opensuse(a)sukimashita.com + +- Update to version 1.0.7 + * Detect iPad 2 and upcoming next generation iPhone devices + * Fix support for ancient devices running iOS 1.x + * Optionally use inotify instead of polling to safe energy + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:download_url:usbmuxd-1.0.6.tar.bz2 New: ---- _service:download_url:usbmuxd-1.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbmuxd.spec ++++++ --- /var/tmp/diff_new_pack.c0o4GZ/_old 2011-03-31 09:59:21.000000000 +0200 +++ /var/tmp/diff_new_pack.c0o4GZ/_new 2011-03-31 09:59:21.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package usbmuxd (Version 1.0.6) +# spec file for package usbmuxd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,8 +19,8 @@ Name: usbmuxd %define _libname libusbmuxd -Version: 1.0.6 -Release: 2 +Version: 1.0.7 +Release: 1 License: LGPL v2.1 or GPL v2 Summary: Socket daemon for the usbmux protocol of iPhone/iPod Touch devices Url: http://git.marcansoft.com/?p=usbmuxd.git @@ -32,6 +32,7 @@ BuildRequires: libusb-1_0-devel >= 1.0.3 BuildRequires: pkg-config BuildRequires: udev +Requires(pre): pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,6 +80,10 @@ It allows you to map a port of a service running on the device (like sshd) and redirect it to your local machine where you can interact with it. +%pre +getent passwd usbmux >/dev/null || useradd -r -g nogroup -d /var/lib/%{name} -s /sbin/nologin -c "%{name} daemon" usbmux +exit 0 + %prep %setup -q @@ -105,6 +110,8 @@ %install cd build %{__make} install DESTDIR=%{buildroot} +# make sure the device gets owned by the usbmux user +sed -i 's@RUN+="/usr/sbin/usbmuxd -u -U usbmux"@OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"@' %{buildroot}/lib/udev/rules.d/85-usbmuxd.rules %clean rm -rf %{buildroot} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.c0o4GZ/_old 2011-03-31 09:59:21.000000000 +0200 +++ /var/tmp/diff_new_pack.c0o4GZ/_new 2011-03-31 09:59:21.000000000 +0200 @@ -1,7 +1,7 @@ <services> <service name="download_url"> - <param name="host">marcansoft.com</param> - <param name="protocol">http</param> - <param name="path">/uploads/usbmuxd/usbmuxd-1.0.6.tar.bz2</param> - </service> + + + + <param name="host">marcansoft.com</param><param name="path">/uploads/usbmuxd/usbmuxd-1.0.7.tar.bz2</param><param name="protocol">http</param></service> </services> \ No newline at end of file ++++++ _service:download_url:usbmuxd-1.0.6.tar.bz2 -> _service:download_url:usbmuxd-1.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/Modules/FindInotify.cmake new/usbmuxd-1.0.7/Modules/FindInotify.cmake --- old/usbmuxd-1.0.6/Modules/FindInotify.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/usbmuxd-1.0.7/Modules/FindInotify.cmake 2011-03-15 12:35:15.000000000 +0100 @@ -0,0 +1,11 @@ +set(INOTIFY_H "NOTFOUND") +find_file(INOTIFY_H + "sys/inotify.h" + PATHS ENV INCLUDE +) + +if (INOTIFY_H) + set(INOTIFY_FOUND TRUE) +else() + set(INOTIFY_FOUND FALSE) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/daemon/usb-linux.c new/usbmuxd-1.0.7/daemon/usb-linux.c --- old/usbmuxd-1.0.6/daemon/usb-linux.c 2010-09-28 03:32:44.000000000 +0200 +++ new/usbmuxd-1.0.7/daemon/usb-linux.c 2011-03-15 12:35:15.000000000 +0100 @@ -334,16 +334,23 @@ usbmuxd_log(LL_WARNING, "Endpoint count mismatch for interface %d of device %d-%d", intf->bInterfaceNumber, bus, address); continue; } - if((intf->endpoint[0].bEndpointAddress & 0x80) != LIBUSB_ENDPOINT_OUT || - (intf->endpoint[1].bEndpointAddress & 0x80) != LIBUSB_ENDPOINT_IN) { + if((intf->endpoint[0].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_OUT && + (intf->endpoint[1].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_IN) { + usbdev->interface = intf->bInterfaceNumber; + usbdev->ep_out = intf->endpoint[0].bEndpointAddress; + usbdev->ep_in = intf->endpoint[1].bEndpointAddress; + usbmuxd_log(LL_INFO, "Found interface %d with endpoints %02x/%02x for device %d-%d", usbdev->interface, usbdev->ep_out, usbdev->ep_in, bus, address); + break; + } else if((intf->endpoint[1].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_OUT && + (intf->endpoint[0].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_IN) { + usbdev->interface = intf->bInterfaceNumber; + usbdev->ep_out = intf->endpoint[1].bEndpointAddress; + usbdev->ep_in = intf->endpoint[0].bEndpointAddress; + usbmuxd_log(LL_INFO, "Found interface %d with swapped endpoints %02x/%02x for device %d-%d", usbdev->interface, usbdev->ep_out, usbdev->ep_in, bus, address); + break; + } else { usbmuxd_log(LL_WARNING, "Endpoint type mismatch for interface %d of device %d-%d", intf->bInterfaceNumber, bus, address); - continue; } - usbdev->interface = intf->bInterfaceNumber; - usbdev->ep_out = intf->endpoint[0].bEndpointAddress; - usbdev->ep_in = intf->endpoint[1].bEndpointAddress; - usbmuxd_log(LL_INFO, "Found interface %d with endpoints %02x/%02x for device %d-%d", usbdev->interface, usbdev->ep_out, usbdev->ep_in, bus, address); - break; } libusb_free_config_descriptor(config); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/daemon/usb.h new/usbmuxd-1.0.7/daemon/usb.h --- old/usbmuxd-1.0.6/daemon/usb.h 2010-09-28 03:32:44.000000000 +0200 +++ new/usbmuxd-1.0.7/daemon/usb.h 2011-03-15 12:35:15.000000000 +0100 @@ -46,7 +46,7 @@ #define VID_APPLE 0x5ac #define PID_RANGE_LOW 0x1290 -#define PID_RANGE_MAX 0x129f +#define PID_RANGE_MAX 0x12af struct usb_device; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/libusbmuxd/CMakeLists.txt new/usbmuxd-1.0.7/libusbmuxd/CMakeLists.txt --- old/usbmuxd-1.0.6/libusbmuxd/CMakeLists.txt 2010-09-28 03:32:44.000000000 +0200 +++ new/usbmuxd-1.0.7/libusbmuxd/CMakeLists.txt 2011-03-15 12:35:15.000000000 +0100 @@ -1,6 +1,15 @@ include_directories (${CMAKE_SOURCE_DIR}/common) find_package(Threads) +option(WANT_INOTIFY "Build with inotify support" ON) +if (WANT_INOTIFY) +find_package(Inotify) +if (INOTIFY_FOUND) + add_definitions("-DHAVE_INOTIFY") + message("-- libusbmuxd will be built with inotify support") +endif() +endif(WANT_INOTIFY) + add_library (libusbmuxd SHARED libusbmuxd.c sock_stuff.c ${CMAKE_SOURCE_DIR}/common/utils.c) find_library (PTHREAD pthread) @@ -24,6 +33,9 @@ if(APPLE) set_target_properties(libusbmuxd PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") endif() +if(WIN32) + set_target_properties(libusbmuxd PROPERTIES PREFIX "lib" IMPORT_PREFIX "lib") +endif() install(TARGETS libusbmuxd RUNTIME DESTINATION bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/libusbmuxd/libusbmuxd.c new/usbmuxd-1.0.7/libusbmuxd/libusbmuxd.c --- old/usbmuxd-1.0.6/libusbmuxd/libusbmuxd.c 2010-09-28 03:32:44.000000000 +0200 +++ new/usbmuxd-1.0.7/libusbmuxd/libusbmuxd.c 2011-03-15 12:35:15.000000000 +0100 @@ -30,13 +30,24 @@ #include <windows.h> #include <winsock2.h> #define sleep(x) Sleep(x*1000) +#define EPROTO 71 +#define EBADMSG 77 #else #include <sys/socket.h> #include <arpa/inet.h> +#include <pthread.h> #endif + +#ifdef HAVE_INOTIFY +#include <sys/inotify.h> +#define EVENT_SIZE (sizeof (struct inotify_event)) +#define EVENT_BUF_LEN (1024 * (EVENT_SIZE + 16)) +#define USBMUXD_DIRNAME "/var/run" +#define USBMUXD_SOCKET_NAME "usbmuxd" +#endif /* HAVE_INOTIFY */ + #include <unistd.h> #include <signal.h> -#include <pthread.h> #ifdef HAVE_PLIST #include <plist/plist.h> @@ -56,7 +67,11 @@ static struct collection devices; static usbmuxd_event_cb_t event_cb = NULL; +#ifdef WIN32 +HANDLE devmon = NULL; +#else pthread_t devmon; +#endif static int listenfd = -1; static int use_tag = 0; @@ -374,19 +389,10 @@ callback(&ev, user_data); } -/** - * Tries to connect to usbmuxd and wait if it is not running. - * - * TODO inotify support should come here - */ -static int usbmuxd_listen() +static int usbmuxd_listen_poll() { int sfd; - uint32_t res = -1; -#ifdef HAVE_PLIST -retry: -#endif sfd = connect_usbmuxd_socket(); if (sfd < 0) { while (event_cb) { @@ -397,6 +403,86 @@ } } + return sfd; +} + +#ifdef HAVE_INOTIFY +static int usbmuxd_listen_inotify() +{ + int inot_fd; + int watch_fd; + int sfd; + + sfd = connect_usbmuxd_socket(); + if (sfd >= 0) + return sfd; + + sfd = -1; + inot_fd = inotify_init (); + if (inot_fd < 0) { + fprintf (stderr, "Failed to setup inotify\n"); + return -1; + } + + /* inotify is setup, listen for events that concern us */ + watch_fd = inotify_add_watch (inot_fd, USBMUXD_DIRNAME, IN_CREATE); + if (watch_fd < 0) { + fprintf (stderr, "Failed to setup watch for socket dir\n"); + close (inot_fd); + return -1; + } + + while (1) { + ssize_t len, i; + char buff[EVENT_BUF_LEN] = {0}; + + i = 0; + len = read (inot_fd, buff, EVENT_BUF_LEN -1); + if (len < 0) + goto end; + while (i < len) { + struct inotify_event *pevent = (struct inotify_event *) & buff[i]; + + /* check that it's ours */ + if (pevent->mask & IN_CREATE && + pevent->len && + pevent->name != NULL && + strcmp(pevent->name, USBMUXD_SOCKET_NAME) == 0) { + sfd = connect_usbmuxd_socket (); + goto end; + } + i += EVENT_SIZE + pevent->len; + } + } + +end: + close(watch_fd); + close(inot_fd); + + return sfd; +} +#endif /* HAVE_INOTIFY */ + +/** + * Tries to connect to usbmuxd and wait if it is not running. + */ +static int usbmuxd_listen() +{ + int sfd; + uint32_t res = -1; + +#ifdef HAVE_PLIST +retry: +#endif + +#ifdef HAVE_INOTIFY + sfd = usbmuxd_listen_inotify(); + if (sfd < 0) + sfd = usbmuxd_listen_poll(); +#else + sfd = usbmuxd_listen_poll(); +#endif + if (sfd < 0) { fprintf(stderr, "%s: ERROR: usbmuxd was supposed to be running here...\n", __func__); return sfd; @@ -525,7 +611,15 @@ } event_cb = callback; +#ifdef WIN32 + res = 0; + devmon = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)device_monitor, user_data, 0, NULL); + if (devmon == NULL) { + res = GetLastError(); + } +#else res = pthread_create(&devmon, NULL, device_monitor, user_data); +#endif if (res != 0) { fprintf(stderr, "%s: ERROR: Could not start device watcher thread!\n", __func__); return res; @@ -537,12 +631,20 @@ { event_cb = NULL; +#ifdef WIN32 + if (devmon != NULL) { + close_socket(listenfd); + listenfd = -1; + WaitForSingleObject(devmon, INFINITE); + } +#else if (pthread_kill(devmon, 0) == 0) { close_socket(listenfd); listenfd = -1; pthread_kill(devmon, SIGINT); pthread_join(devmon, NULL); } +#endif return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/tools/iproxy.c new/usbmuxd-1.0.7/tools/iproxy.c --- old/usbmuxd-1.0.6/tools/iproxy.c 2010-09-28 03:32:44.000000000 +0200 +++ new/usbmuxd-1.0.7/tools/iproxy.c 2011-03-15 12:35:15.000000000 +0100 @@ -40,9 +40,9 @@ #include <sys/socket.h> #include <sys/un.h> #include <arpa/inet.h> -#endif #include <pthread.h> #include <netinet/in.h> +#endif #include "sock_stuff.h" #include "usbmuxd.h" @@ -105,12 +105,20 @@ int recv_len; int sent; char buffer[131072]; +#ifdef WIN32 + HANDLE stoc = NULL; +#else pthread_t stoc; +#endif printf("%s: fd = %d\n", __func__, cdata->fd); cdata->stop_stoc = 0; +#ifdef WIN32 + stoc = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)run_stoc_loop, cdata, 0, NULL); +#else pthread_create(&stoc, NULL, run_stoc_loop, cdata); +#endif while (!cdata->stop_ctos && cdata->fd>0 && cdata->sfd>0) { recv_len = recv_buf_timeout(cdata->fd, buffer, sizeof(buffer), 0, 5000); @@ -143,7 +151,11 @@ cdata->fd = -1; cdata->stop_stoc = 1; +#ifdef WIN32 + WaitForSingleObject(stoc, INFINITE); +#else pthread_join(stoc, NULL); +#endif return NULL; } @@ -152,7 +164,11 @@ { struct client_data *cdata; usbmuxd_device_info_t *dev_list = NULL; +#ifdef WIN32 + HANDLE ctos = NULL; +#else pthread_t ctos; +#endif int count; if (!arg) { @@ -184,8 +200,13 @@ fprintf(stderr, "Error connecting to device!\n"); } else { cdata->stop_ctos = 0; +#ifdef WIN32 + ctos = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)run_ctos_loop, cdata, 0, NULL); + WaitForSingleObject(ctos, INFINITE); +#else pthread_create(&ctos, NULL, run_ctos_loop, cdata); pthread_join(ctos, NULL); +#endif } if (cdata->fd > 0) { @@ -226,7 +247,11 @@ fprintf(stderr, "Error creating socket: %s\n", strerror(errno)); return -errno; } else { +#ifdef WIN32 + HANDLE acceptor = NULL; +#else pthread_t acceptor; +#endif struct sockaddr_in c_addr; socklen_t len = sizeof(struct sockaddr_in); struct client_data cdata; @@ -237,8 +262,13 @@ if (c_sock) { printf("accepted connection, fd = %d\n", c_sock); cdata.fd = c_sock; +#ifdef WIN32 + acceptor = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)acceptor_thread, &cdata, 0, NULL); + WaitForSingleObject(acceptor, INFINITE); +#else pthread_create(&acceptor, NULL, acceptor_thread, &cdata); pthread_join(acceptor, NULL); +#endif } else { break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/udev/85-usbmuxd.rules.in new/usbmuxd-1.0.7/udev/85-usbmuxd.rules.in --- old/usbmuxd-1.0.6/udev/85-usbmuxd.rules.in 2010-09-28 03:32:44.000000000 +0200 +++ new/usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-03-15 12:35:15.000000000 +0100 @@ -1,7 +1,7 @@ # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) -# Forces iPhone 1.0, 3G, 3GS, iPodTouch 1/2 and iPad to USB configuration 3 and run usbmuxd -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" +# Forces iDevices to the last USB configuration and runs usbmuxd +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" # Exit usbmuxd when the last device is removed -ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" +ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/version.tag new/usbmuxd-1.0.7/version.tag --- old/usbmuxd-1.0.6/version.tag 2010-10-24 14:49:27.000000000 +0200 +++ new/usbmuxd-1.0.7/version.tag 2011-03-22 10:12:35.000000000 +0100 @@ -1 +1 @@ -1.0.6 +1.0.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner20 for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner20 for openSUSE:Factory checked in at Thu Mar 31 09:53:11 CEST 2011. -------- --- mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-23 10:07:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-03-29 13:55:53.000000000 +0200 @@ -1,0 +2,31 @@ +Tue Mar 29 11:55:53 UTC 2011 - cfarrell(a)novell.com + +- license update: MPLv1.1 or GPLv2+ or LGPLv2+ + Sync licenses with Fedora. MPL does not state ^or later^ + +------------------------------------------------------------------- +Mon Mar 28 19:21:46 UTC 2011 - idoenmez(a)novell.com + +- Add mozilla-gcc46.patch: fix compilation with gcc 4.6 + See the following bug reports: + https://bugzilla.mozilla.org/show_bug.cgi?id=623116 + https://bugzilla.mozilla.org/show_bug.cgi?id=623123 + https://bugzilla.mozilla.org/show_bug.cgi?id=623126 + https://bugzilla.mozilla.org/show_bug.cgi?id=628371 + +------------------------------------------------------------------- +Mon Mar 28 16:25:25 UTC 2011 - llunak(a)novell.com + +- fix 'save as' with KDE integration (bnc#557598) + +------------------------------------------------------------------- +Fri Mar 18 08:48:12 UTC 2011 - wr(a)rosenauer.org + +- update to 2.0 (rc2) + * removed upstreamed mozilla-gio-launch-uri.patch + * updated supported locale list +- set useragent buildid to branded Firefox default +- apply mozilla-cairo-lcd.patch for internal cairo to fix + font smoothing in combination with freetype + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-2.0b12.tar.bz2 mozilla-gio-launch-uri.patch xulrunner-source-2.0b12.tar.bz2 New: ---- l10n-2.0.0.tar.bz2 mozilla-cairo-lcd.patch mozilla-gcc46.patch mozilla-gecko-version.patch xulrunner-source-2.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner20.spec ++++++ --- /var/tmp/diff_new_pack.N83xQ2/_old 2011-03-31 09:47:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N83xQ2/_new 2011-03-31 09:47:40.000000000 +0200 @@ -29,13 +29,13 @@ %else BuildRequires: wireless-tools %endif -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 2.0b12 +License: MPLv1.1 or GPLv2+ or LGPLv2+ +Version: 2.0.0 Release: 1 -%define releasedate 2011022200 -%define version_internal 2.0b12 +%define releasedate 2011031700 +%define version_internal 2.0.0 %define apiversion 2.0 -%define uaweight 199900 +%define uaweight 200000 Summary: Mozilla Runtime Environment 2.0 Url: http://www.mozilla.org Group: Productivity/Other @@ -64,17 +64,19 @@ Patch5: mozilla-prefer_plugin_pref.patch Patch6: mozilla-shared-nss-db.patch Patch7: mozilla-kde.patch +Patch8: mozilla-cairo-lcd.patch # PATCH-FEATURE-SLED FATE#302023, FATE#302024 -Patch8: mozilla-gconf-backend.patch -Patch9: gecko-lockdown.patch -Patch10: toolkit-ui-lockdown.patch +Patch9: mozilla-gconf-backend.patch +Patch10: gecko-lockdown.patch +Patch11: toolkit-ui-lockdown.patch # --- -Patch11: mozilla-cpuid.patch -Patch12: mozilla-language.patch -Patch13: mozilla-gio.patch -Patch14: mozilla-cairo-return.patch -Patch15: mozilla-gio-launch-uri.patch +Patch12: mozilla-cpuid.patch +Patch13: mozilla-language.patch +Patch14: mozilla-gio.patch +Patch15: mozilla-cairo-return.patch Patch16: mozilla-ntlm-full-path.patch +Patch17: mozilla-gecko-version.patch +Patch18: mozilla-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js20 = %{version} Requires(post): update-alternatives coreutils @@ -101,7 +103,7 @@ Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %endif %if %has_system_nss -BuildRequires: mozilla-nss-devel >= 3.12.6 +BuildRequires: mozilla-nss-devel >= 3.12.8 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif Recommends: %{name}-gnome @@ -113,7 +115,7 @@ %package -n mozilla-js20 -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Mozilla JS 1.8.5 engine Group: Productivity/Other @@ -125,7 +127,7 @@ %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: XULRunner/Gecko SDK 2.0 Group: Development/Libraries/Other %if %has_system_nspr @@ -142,7 +144,7 @@ %if %localize %package translations-common -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Common translations for XULRunner 2.0 Group: System/Localization Requires: %{name} = %{version} @@ -159,11 +161,11 @@ %package translations-other -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Extra translations for XULRunner 2.0 Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -175,23 +177,23 @@ %endif %package gnome -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: XULRunner components depending on gnome-vfs Group: Productivity/Other Requires: %{name} = %{version}-%{release} Requires(post): coreutils %description gnome -This subpackage contains the Necko Gnome-VFS and Gnome components which -rely on the gnome-vfs subsystem to be installed. They are recommended -for full desktop integration but not mandatory for small disk footprint +This subpackage contains the Gnome components which rely on certain +Gnome subsystems to be installed. They are recommended for full +desktop integration but not mandatory for small disk footprint KDE installations for example. %if %crashreporter %package buildsymbols -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Breakpad buildsymbols for %{name} Group: Development/Debug @@ -209,17 +211,19 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -#%patch8 -p1 +%patch8 -p1 #%patch9 -p1 #%patch10 -p1 -%if %suse_version < 1120 #%patch11 -p1 +%if %suse_version < 1120 +#%patch12 -p1 %endif -%patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 %build kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) @@ -227,6 +231,9 @@ echo fix kde helper version in the .spec file exit 1 fi +source other-licenses/branding/firefox/configure.sh +unset MOZ_APP_DISPLAYNAME +export MOZ_UA_BUILDID MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal} export MOZ_BUILD_DATE=%{releasedate} export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.N83xQ2/_old 2011-03-31 09:47:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N83xQ2/_new 2011-03-31 09:47:40.000000000 +0200 @@ -1,8 +1,8 @@ #!/bin/bash -BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b12_RELEASE" -VERSION="2.0b12" +BRANCH="releases/mozilla-2.0" +RELEASE_TAG="FIREFOX_4_0rc2_RELEASE" +VERSION="2.0.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -18,7 +18,7 @@ ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n-mozilla-2.0/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac ++++++ l10n-2.0b12.tar.bz2 -> l10n-2.0.0.tar.bz2 ++++++ mozilla-xulrunner20/l10n-2.0b12.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/l10n-2.0.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-cairo-lcd.patch ++++++ ++++ 1333 lines (skipped) ++++++ mozilla-gcc46.patch ++++++ See the following bug reports; https://bugzilla.mozilla.org/show_bug.cgi?id=623116 https://bugzilla.mozilla.org/show_bug.cgi?id=623123 https://bugzilla.mozilla.org/show_bug.cgi?id=623126 https://bugzilla.mozilla.org/show_bug.cgi?id=628371 diff --git a/xpcom/base/nsDebugImpl.h b/xpcom/base/nsDebugImpl.h --- a/xpcom/base/nsDebugImpl.h +++ b/xpcom/base/nsDebugImpl.h @@ -40,6 +40,7 @@ class nsDebugImpl : public nsIDebug2 { public: + nsDebugImpl() {} NS_DECL_ISUPPORTS NS_DECL_NSIDEBUG NS_DECL_NSIDEBUG2 diff --git a/xpcom/base/nsTraceRefcntImpl.h b/xpcom/base/nsTraceRefcntImpl.h --- a/xpcom/base/nsTraceRefcntImpl.h +++ b/xpcom/base/nsTraceRefcntImpl.h @@ -44,6 +44,7 @@ class nsTraceRefcntImpl : public nsITraceRefcnt { public: + nsTraceRefcntImpl() {} NS_DECL_ISUPPORTS NS_DECL_NSITRACEREFCNT diff --git a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp --- a/xpcom/glue/nsEnumeratorUtils.cpp +++ b/xpcom/glue/nsEnumeratorUtils.cpp @@ -52,6 +52,7 @@ class EmptyEnumeratorImpl : public nsISi public nsIStringEnumerator { public: + EmptyEnumeratorImpl() {} // nsISupports interface NS_DECL_ISUPPORTS_INHERITED // not really inherited, but no mRefCnt diff --git a/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h --- a/xpcom/io/nsUnicharInputStream.h +++ b/xpcom/io/nsUnicharInputStream.h @@ -51,6 +51,7 @@ class nsSimpleUnicharStreamFactory : private nsISimpleUnicharStreamFactory { public: + nsSimpleUnicharStreamFactory() {} NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSIFACTORY NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY diff --git a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h --- a/intl/unicharutil/util/nsUnicharUtils.h +++ b/intl/unicharutil/util/nsUnicharUtils.h @@ -103,6 +103,7 @@ public: class nsASCIICaseInsensitiveStringComparator : public nsStringComparator { public: + nsASCIICaseInsensitiveStringComparator() {} virtual int operator() (const PRUnichar*, const PRUnichar*, PRUint32, diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -616,6 +616,7 @@ class nsXULAppInfo : public nsIXULAppInf { public: + nsXULAppInfo() {} NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSIXULAPPINFO NS_DECL_NSIXULRUNTIME diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp index 57fd9b1..0052ca7 100644 --- a/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -99,6 +99,7 @@ nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull; class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2 { public: + GTKEmbedDirectoryProvider() {} NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSIDIRECTORYSERVICEPROVIDER NS_DECL_NSIDIRECTORYSERVICEPROVIDER2 ++++++ mozilla-gecko-version.patch ++++++ # HG changeset patch # Parent 7d3dc831fb0c3282bda0e5da3f7965e6422ee294 diff --git a/config/milestone.txt b/config/milestone.txt --- a/config/milestone.txt +++ b/config/milestone.txt @@ -5,9 +5,9 @@ # x.x.x.x # x.x.x+ # # Referenced by milestone.pl. # Hopefully I'll be able to automate replacement of *all* # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -2.0 +2.0.0 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.N83xQ2/_old 2011-03-31 09:47:41.000000000 +0200 +++ /var/tmp/diff_new_pack.N83xQ2/_new 2011-03-31 09:47:41.000000000 +0200 @@ -2158,7 +2158,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/xre/nsKDEUtils.cpp -@@ -0,0 +1,334 @@ +@@ -0,0 +1,328 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -2359,12 +2359,6 @@ + { + if( !startHelper()) + return false; -+ // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog -+ // is called with a delay), then do not do anything, as this app would keep -+ // the grabs but block waiting for the helper, which would be unable to do -+ // anything because of the grab -+ if( blockUi && gdk_pointer_is_grabbed()) -+ return false; + feedCommand( command ); + // do not store the data in 'this' but in extra structure, just in case there + // is reentrancy (can there be? the event loop is re-entered) @@ -2945,7 +2939,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,28 +50,31 @@ +@@ -50,30 +50,33 @@ #include <QString> #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> @@ -2957,6 +2951,8 @@ -#include "nsGNOMERegistry.h" +#include "nsCommonRegistry.h" #include "nsIGIOService.h" + #include "nsNetCID.h" + #include "nsIIOService.h" #include "nsIGnomeVFSService.h" #include "nsAutoPtr.h" #ifdef MOZ_ENABLE_DBUS @@ -2979,7 +2975,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3004,7 +3000,7 @@ if (*_retval) return NS_OK; -@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3031,12 +3027,14 @@ + } + nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); + nsCAutoString uriSpec; if (giovfs) { - nsCOMPtr<nsIGIOMimeApp> app; - if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) - return app->Launch(nativePath); - } else if (gnomevfs) { + // nsGIOMimeApp->Launch wants a URI string instead of local file + nsresult rv; + nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr<nsIURI> uri; +@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3053,7 +3051,7 @@ if (giovfs) { nsCOMPtr<nsIGIOMimeApp> app; if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) - return app->Launch(nativePath); + return app->Launch(uriSpec); } else if (gnomevfs) { diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp ++++++ xulrunner-source-2.0b12.tar.bz2 -> xulrunner-source-2.0.0.tar.bz2 ++++++ mozilla-xulrunner20/xulrunner-source-2.0b12.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/xulrunner-source-2.0.0.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 postfix for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at Thu Mar 31 09:47:17 CEST 2011. -------- --- postfix/postfix.changes 2011-02-10 12:44:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2011-03-31 00:00:51.000000000 +0200 @@ -1,0 +2,34 @@ +Wed Mar 30 21:21:16 UTC 2011 - varkoly(a)novell.com + +- update to 2.8.2 + * DNSBL/DNSWL: + o Support for address patterns in DNS blacklist and whitelist lookup results. + o The Postfix SMTP server now supports DNS-based whitelisting with several safety features + * Support for read-only sqlite database access. + * Alias expansion: + o Postfix now reports a temporary delivery error when the result + of virtual alias expansion would exceed the virtual_alias_recursion_limit + or virtual_alias_expansion_limit. + o To avoid repeated delivery to mailing lists with pathological + nested alias configurations, the local(8) delivery agent now keeps + the owner-alias attribute of a parent alias, when delivering mail + to a child alias that does not have its own owner alias. + * The Postfix SMTP client no longer appends the local domain when + looking up a DNS name without ".". + * The SMTP server now supports contact information that is appended + to "reject" responses: smtpd_reject_footer + * Postfix by default no longer adds a "To: undisclosed-recipients:;" + header when no recipient specified in the message header. + * tls support: + o The Postfix SMTP server now always re-computes the SASL mechanism + list after successful completion of the STARTTLS command. + o The smtpd_starttls_timeout default value is now stress-dependent. + o Postfix no longer appends the system-supplied default CA certificates + to the lists specified with *_tls_CAfile or with *_tls_CApath. + * New feature: Prototype postscreen(8) server that runs a number + of time-consuming checks in parallel for all incoming SMTP connections, + before clients are allowed to talk to a real Postfix SMTP server. + It detects clients that start talking too soon, or clients that appear + on DNS blocklists, or clients that hang up without sending any command. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- postfix-2.7.2.tar.bz2 New: ---- postfix-2.8.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.oiu9Im/_old 2011-03-31 09:46:04.000000000 +0200 +++ /var/tmp/diff_new_pack.oiu9Im/_new 2011-03-31 09:46:04.000000000 +0200 @@ -21,8 +21,8 @@ Name: postfix Summary: A fast, secure, and flexible mailer -Version: 2.7.2 -Release: 3 +Version: 2.8.2 +Release: 1 License: IBM Public License .. Group: Productivity/Networking/Email/Servers Url: http://www.postfix.org/ ++++++ dynamic_maps.patch ++++++ ++++ 622 lines (skipped) ++++ between postfix/dynamic_maps.patch ++++ and /mounts/work_src_done/STABLE/postfix/dynamic_maps.patch ++++++ pointer_to_literals.patch ++++++ --- /var/tmp/diff_new_pack.oiu9Im/_old 2011-03-31 09:46:04.000000000 +0200 +++ /var/tmp/diff_new_pack.oiu9Im/_new 2011-03-31 09:46:04.000000000 +0200 @@ -1,9 +1,7 @@ -Nur in postfix-2.3.2/: FILE_TO_FIX. -Nur in postfix-2.3.2-orig/: postfix-2.3.0. -diff -r -u postfix-2.3.2-orig/src/cleanup/cleanup_message.c postfix-2.3.2/src/cleanup/cleanup_message.c ---- postfix-2.3.2-orig/src/cleanup/cleanup_message.c 2006-06-15 20:07:15.000000000 +0200 -+++ postfix-2.3.2/src/cleanup/cleanup_message.c 2007-03-05 18:10:32.000000000 +0100 -@@ -288,7 +288,7 @@ +diff -ur postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c +--- postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c 2010-07-27 22:34:20.000000000 +0200 ++++ postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c 2011-03-30 23:10:42.774254791 +0200 +@@ -290,7 +290,7 @@ while (*optional_text && ISSPACE(*optional_text)) optional_text++; @@ -12,9 +10,10 @@ #define CLEANUP_ACT_DROP 0 /* -diff -r -u postfix-2.3.2-orig/src/local/local_expand.c postfix-2.3.2/src/local/local_expand.c ---- postfix-2.3.2-orig/src/local/local_expand.c 2005-05-31 15:44:14.000000000 +0200 -+++ postfix-2.3.2/src/local/local_expand.c 2007-03-05 17:59:03.000000000 +0100 +Nur in postfix-2.8.2-pointer_to_literals/src/cleanup: cleanup_message.c.orig. +diff -ur postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c postfix-2.8.2-pointer_to_literals/src/local/local_expand.c +--- postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c 2005-05-31 15:44:14.000000000 +0200 ++++ postfix-2.8.2-pointer_to_literals/src/local/local_expand.c 2011-03-30 23:10:42.775254802 +0200 @@ -114,7 +114,7 @@ { LOCAL_EXP *local = (LOCAL_EXP *) ptr; @@ -24,10 +23,10 @@ if (STREQ(name, "user")) { return (local->state->msg_attr.user); -diff -r -u postfix-2.3.2-orig/src/smtpd/smtpd_check.c postfix-2.3.2/src/smtpd/smtpd_check.c ---- postfix-2.3.2-orig/src/smtpd/smtpd_check.c 2006-07-07 22:32:43.000000000 +0200 -+++ postfix-2.3.2/src/smtpd/smtpd_check.c 2007-03-07 13:36:48.000000000 +0100 -@@ -353,6 +353,10 @@ +diff -ur postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c +--- postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c 2011-01-04 20:03:50.000000000 +0100 ++++ postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c 2011-03-30 23:12:46.513254818 +0200 +@@ -359,6 +359,10 @@ #define CONST_STR(x) ((const char *) vstring_str(x)) #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); } @@ -38,7 +37,7 @@ /* * If some decision can't be made due to a temporary error, then change * other decisions into deferrals. -@@ -1928,8 +1932,6 @@ +@@ -1950,8 +1954,6 @@ if (msg_verbose) msg_info("%s: %s %s %s", myname, table, value, datum); @@ -47,26 +46,19 @@ /* * DUNNO means skip this table. Silently ignore optional text. */ -@@ -2767,7 +2769,6 @@ - /* - * "sender_name" or "recipient_name". - */ --#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0) - - else if (STREQ(suffix, MAIL_ATTR_S_NAME)) { - if (*addr) { -@@ -2817,7 +2818,6 @@ - if (msg_verbose > 1) - msg_info("smtpd_expand_lookup: ${%s}", name); +@@ -2934,8 +2936,6 @@ + SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context; + SMTPD_STATE *state = rbl_exp->state; --#define STREQN(x,y,n) (*(x) == *(y) && strncmp((x), (y), (n)) == 0) - #define CONST_LEN(x) (sizeof(x) - 1) +-#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0) +- + if (state->expand_buf == 0) + state->expand_buf = vstring_alloc(10); - /* -diff -r -u postfix-2.3.2-orig/src/util/dict_open.c postfix-2.3.2/src/util/dict_open.c ---- postfix-2.3.2-orig/src/util/dict_open.c 2007-03-05 17:09:12.000000000 +0100 -+++ postfix-2.3.2/src/util/dict_open.c 2007-03-05 18:07:42.000000000 +0100 -@@ -454,7 +454,7 @@ +diff -ur postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c postfix-2.8.2-pointer_to_literals/src/util/dict_open.c +--- postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200 ++++ postfix-2.8.2-pointer_to_literals/src/util/dict_open.c 2011-03-30 23:10:42.787254814 +0200 +@@ -461,7 +461,7 @@ } #ifndef NO_DYNAMIC_MAPS @@ -75,4 +67,4 @@ void dict_open_dlinfo(const char *path) { -Nur in postfix-2.3.2/: TOFIX. +Nur in postfix-2.8.2-pointer_to_literals/src/util: dict_open.c.orig. ++++++ postfix-2.7.2.tar.bz2 -> postfix-2.8.2.tar.bz2 ++++++ ++++ 43064 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 libreoffice-thesaurus for openSUSE:11.2
by root＠hilbert.suse.de 30 Mar '11

30 Mar '11

Hello community, here is the log from the commit of package libreoffice-thesaurus for openSUSE:11.2 checked in at Thu Mar 31 01:59:09 CEST 2011. Wide character in print at /work/src/bin/tools/get_bugzilla line 45. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/11.2/libreoffice-thesaurus/libreoffice-thesaurus.changes 2011-03-18 22:35:05.000000000 +0100 @@ -0,0 +1,79 @@ +------------------------------------------------------------------- +Fri Mar 18 22:12:32 CET 2011 - pmladek(a)suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Wed Feb 2 21:19:05 CET 2011 - pmladek(a)suse.cz + +- renamed from OpenOffice_org-thesaurus to libreoffice-thesaurus +- added provides locale(libreoffice:<lang>) to make it installed + with libreoffice (bnc#668145) +- installed files into /usr/share/mythes to be compatible with other + Linux distributions; added compat symlinks into the older location + /usr/share/ooo/thesaurus +- bumped version to make sure that it is considered as a replacement + of the older package + +------------------------------------------------------------------- +Fri Apr 9 20:28:50 CEST 2010 - pmladek(a)suse.cz + +- added dos2unix to BuildRequires; called on documentation files + +------------------------------------------------------------------- +Thu Apr 8 18:31:27 CEST 2010 - pmladek(a)suse.cz + +- updated: German, French, Irish, Polish, Portuguese, Romanian, Russian, + Slovak, Swedish, Swiss +- added: Austrian, Australian, Argentine Spanish, Catalan, Danish, Italian, + Venezuelan Spanish + +------------------------------------------------------------------- +Thu Apr 8 14:03:03 CEST 2010 - pmladek(a)suse.cz + +- more automatized packaging: + * added unzip to BuildRequires + * added support to repack dictionaries from different type of sources, + including OOo extensions + * added heuristics to install the documentation + * generated spec file using a script + * list all licenses for the source package + +------------------------------------------------------------------- +Tue Feb 9 17:34:07 CET 2010 - pmladek(a)suse.cz + +- fixed the license tag of the British dictionary + +------------------------------------------------------------------- +Tue Feb 9 17:27:12 CET 2010 - pmladek(a)suse.cz + +- renamed OpenOffice_org-en to OpenOffice_org-en-US to make the content clear + and avoid confusion with the new OpenOffice_org-en-GB + +------------------------------------------------------------------- +Mon Feb 06 16:57:05 CEST 2010 - kkemenczy(a)openssue.org + +- added: British (bnc#576443) + +------------------------------------------------------------------- +Mon Sep 29 17:56:01 CEST 2008 - pmladek(a)suse.cz + +- updated: French, Slovak, Romanian, Slovene +- added: Greek, Swedish +- removed obsolete triggerin and postun scripts; OOo-3.0 does not need + it anymore + +------------------------------------------------------------------- +Mon Apr 14 10:45:58 CEST 2008 - lmichnovic(a)suse.cz + +- update: bg_BG, cs_CZ, de_DE, nb_NO, sk_SK +- new packages: de_CH, ga_IE, hu_HU, ro_RO, ru_RU, sl_SI +- not removing $RPM_BUILD_ROOT in %install + +------------------------------------------------------------------- +Thu Jul 19 15:58:26 CEST 2007 - pmladek(a)suse.cz + +- split from the OpenOffice_org package +- source package version 20070719 +- updated: German, Polish +- added: Nepali calling whatdependson for 11.2-i586 New: ---- DanskeSynonymer.oxt Diccionarios-Argentina_1.oxt Dizionari.IT_20081129.oxt SwedishThesaurus.oxt dict-de_AT-frami_2010-03-07.oxt dict-de_CH-frami_2010-03-07.oxt dict-de_DE-frami_2010-03-07.oxt dict-en-au-2008-12-15.oxt dict-es_VE.oxt dict-ro.1.1.oxt dict-sk.oxt dict_ru_RU-0.3.4.oxt focloiri-gaeilge-4.4.oxt libreoffice-thesaurus-gen-spec libreoffice-thesaurus.changes libreoffice-thesaurus.data libreoffice-thesaurus.spec libreoffice-thesaurus.spec.in oo3x-pt-PT.oxt ooo-dictionnaire-fr-reforme1990-v3.5.oxt pl-dict.oxt th_el.tar.bz2 thes_bg_BG_v2.tar.bz2 thes_cs_CZ_v2.tar.bz2 thes_en_GB_v2.tar.bz2 thes_en_US_v2.tar.bz2 thes_es_ES_v2.tar.bz2 thes_hu_HU_v2.tar.bz2 thes_nb_NO_v2.tar.bz2 thes_ne_NP_v2.tar.bz2 thes_sl_SI_v2.tar.bz2 thesaurus-ca.oxt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-thesaurus.spec ++++++ ++++ 809 lines (skipped) ++++++ libreoffice-thesaurus-gen-spec ++++++ ++++ 621 lines (skipped) ++++++ libreoffice-thesaurus.data ++++++ # file format: # # comments are separated by # # # supported tags # Language: language name, e.g Catalan, German, Norwegian Bokmaal # pack_suffix: package name is normaly defined by the language name (lowercase, # underscore instread of space); you might define a non-standard one # using this tag, e.g norsk-bokmaal for Norwegian Bokmaal # Locale: locale supported by the dictionary, e.g ca_ES # Prov_lang: most dictionaries provides the language defined by the locale; # you might force the full locale using this tag; just mention # the full locale here again, e.g. de_DE vs de_AT # Version: package version, e.g. 2.1.5 # Source: source file name, e.g. catalan.oxt # License: comma separated list of dictionary licenses, e.g. GPLv2, LGPLv2.1 # Types: comma separated list of included dictionary types; possible values are: # myspell, hunspell, hyphen, thesaurus # URL: url where the dictionary sources was taken from, e.g. # http://extensions.services.openoffice.org/project/dict-catalan # Encoding: documentation files in non-UTF-8 enconding should be recoded; the original # encoding is guessed from the locale; you might define another encoding # here, e.g. ISO-8859-1 # dependency: extra dependency, e,g. Conflicts: myspell-german-old # Prep: extra hacks for the %prep section # the whole dictionary might be disabled on some distribution: use %if <condition> and %endif # around all tags related to the dictionary # the Version, Source, License tags might be conditional: use %if <condition>, %else, and %endif # to define the default and distro-specific values Locale: bg_BG Language: Bulgarian License: GPLv2+ Version: 20071210.1 Types: thesaurus # alternative url: http://extensions.services.openoffice.org/project/dictionaries-bg # dictionaries-bg.oxt, version 4.1.5 includes older thesaurus files => no update Url: http://sourceforge.net/projects/bgoffice # Extra source for Bulgarian dictionary because of missing license in # the version in the version available on the OOo site Source: thes_bg_BG_v2.tar.bz2 Locale: ca_ES Language: Catalan URL: http://extensions.services.openoffice.org/project/thesaurus-ca Version: 1.5.0.1 Types: hunspell License: GPLv2, LGPLv2.1 # TODO mail to the owner to solve this Prep: mv thesaurus-ca/dictionaries/README_th_ca_ES_v3.txt thesaurus-ca/dictionaries/README_th_ca_ES_v2.txt Prep: mv thesaurus-ca/dictionaries/th_ca_ES_v3.dat thesaurus-ca/dictionaries/th_ca_ES_v2.dat Prep: mv thesaurus-ca/dictionaries/th_ca_ES_v3.idx thesaurus-ca/dictionaries/th_ca_ES_v2.idx #, hunspell available: http://extensions.services.openoffice.org/project/dict-catalan #, thesaurus available: http://extensions.services.openoffice.org/project/thesaurus-ca Source: thesaurus-ca.oxt Locale: cs_CZ Language: Czech License: BSD3c Version: 20070913.1 Types: thesaurus # alternative url: http://extensions.services.openoffice.org/project/dict-cs # the thesaurus dictionary included in dict-cs-2.0.oxt is not freely redistributable # without asking author => FIXME: asked the author Source: thes_cs_CZ_v2.tar.bz2 Locale: da_DK Language: Danish URL: http://extensions.services.openoffice.org/project/danske_synonymer Version: 20100126.1 Types: thesaurus License: GPLv2, LGPLv2.1, MPLv1.1 # hunspell, hyphen available: http://extensions.services.openoffice.org/project/dict-da Source: DanskeSynonymer.oxt Locale: de_AT Language: Austrian pack_suffix: de-AT Prov_lang: de_AT URL: http://extensions.services.openoffice.org/project/dict-de_AT_frami Version: 20100307.1 Types: hunspell, hyphen, thesaurus License: LGPLv2.1+ Source: dict-de_AT-frami_2010-03-07.oxt Locale: de_CH Language: German-Swiss pack_suffix: de-CH Prov_lang: de_CH URL: http://extensions.services.openoffice.org/project/dict-de_CH_frami Version: 20100307.1 Types: hunspell, hyphen, thesaurus License: LGPLv2.1+ Source: dict-de_CH-frami_2010-03-07.oxt Locale: de_DE Language: German URL: http://extensions.services.openoffice.org/project/dict-de_DE_frami License: LGPLv2.1+ Version: 20100307.1 Types: hunspell, hyphen, thesaurus Source: dict-de_DE-frami_2010-03-07.oxt Locale: el_GR Language: Greek License: GPLv2+ Version: 20061203.1 Types: thesaurus Source: th_el.tar.bz2 Locale: en_AU Language: Australian Pack_suffix: en-AU Prov_lang: en_AU License: BSD4c Version: 20081215.1 Types: myspell, hyphen, thesaurus URL: http://extensions.services.openoffice.org/project/AustralianDictionary Source: dict-en-au-2008-12-15.oxt Locale: en_US Language: American Pack_suffix: en-US Prov_lang: en_US License: BSD4c Version: 20060111.1 Types: thesaurus Dependency: Provides: OpenOffice_org-thesaurus-en = 20060111 Dependency: Obsoletes: OpenOffice_org-thesaurus-en <= 20060111 Source: thes_en_US_v2.tar.bz2 Locale: en_GB Language: British Pack_suffix: en-GB Prov_lang: en_GB License: BSD4c Types: thesaurus Version: 20051128.1 Prep: mv thes_en_GB_v2/th_en_GB_final.dat thes_en_GB_v2/th_en_GB_v2.dat Prep: mv thes_en_GB_v2/th_en_GB_final.idx thes_en_GB_v2/th_en_GB_v2.idx # http://sourceforge.net/projects/brit-thesaurus/ Source: thes_en_GB_v2.tar.bz2 Locale: es_AR Language: Argentine Spanish pack_suffix: es-AR Prov_lang: es_AR URL: http://extensions.services.openoffice.org/project/diccionario_es_AR Version: 0.1.1 Types: myspell, hyphen, thesaurus License: LGPLv2.1 Source: Diccionarios-Argentina_1.oxt Locale: es_ES Language: Spanish License: LGPLv2.1+ Types: thesaurus Version: 20050720.1 Source: thes_es_ES_v2.tar.bz2 Locale: es_VE Language: Venezuelan Spanish pack_suffix: es-VE Prov_lang: es_VE URL: http://extensions.services.openoffice.org/project/dict-es_VE Version: 1.0.1.1 Types: hunspell, hyphen, thesaurus License: GPLv3+ Source: dict-es_VE.oxt Locale: fr_FR Language: French URL: http://extensions.services.openoffice.org/project/french-dictionary-classic… License: LGPLv2.1+ Version: 20100125.1 # 3.5 Types: myspell, hyphen, thesaurus # under investigation, it looks it belongs to several countries Prep: mv ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/thes_fr.dat ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/th_fr_FR_v2.dat Prep: mv ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/thes_fr.idx ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/th_fr_FR_v2.idx Source: ooo-dictionnaire-fr-reforme1990-v3.5.oxt Locale: ga_IE Language: Irish License: GFDLv1.2+ Types: thesaurus Version: 20071002.1 Types: hunspell, hyphen, thesaurus URL: http://extensions.services.openoffice.org/project/focloiri-gaeilge Source: focloiri-gaeilge-4.4.oxt Locale: hu_HU Language: Hungarian License: LGPLv2.1+ Types: thesaurus Version: 20080319.1 # from hu_HU-1.3-pack.zip Source: thes_hu_HU_v2.tar.bz2 Locale: it_IT Language: Italian URL: http://extensions.services.openoffice.org/project/Dict_it_IT Version: 20081129.1 Types: hunspell, hyphen, thesaurus License: AGPLv3+ Source: Dizionari.IT_20081129.oxt # FIXME: the thesaurus dictionary is almost empty #Locale: lv_LV #Language: Latvian #URL: http://extensions.services.openoffice.org/project/dict_lv_LV #Version: 20090916.1 # 0.8.2 #Types: hunspell, hyphen, thesaurus #License: LGPLv2.1 #Source: dict_lv_LV-0.8.2.oxt Locale: nb_NO Language: Norwegian Bokmaal License: GPLv2+ Types: thesaurus Version: 20080310.1 # from no_NO-pack2-2.0.10.zip Source: thes_nb_NO_v2.tar.bz2 Locale: ne_NP Language: Nepali License: LGPLv2.1+ Types: thesaurus Version: 1.1.1 Source: thes_ne_NP_v2.tar.bz2 Locale: pl_PL Language: Polish URL: http://extensions.services.openoffice.org/project/pl-dict License: LGPLv2.1 Types: myspell, hyphen, thesaurus Version: 20081206.1 Source: pl-dict.oxt Locale: pt_PT Language: Portuguese License: GPLv2+ Types: hunspell, hyphen, thesaurus Version: 20091015.1 URL: http://extensions.services.openoffice.org/project/ptPTdict Source: oo3x-pt-PT.oxt Locale: ro_RO Language: Romanian License: GPLv2+ Types: hunspell, hyphen, thesaurus Version: 20091130.1 URL: http://extensions.services.openoffice.org/project/dictionaries-ro-contempor… Source: dict-ro.1.1.oxt Locale: ru_RU Language: Russian License: LGPLv3 Types: myspell, hyphen, thesaurus Version: 20081013.1 # TODO no source URL Source: dict_ru_RU-0.3.4.oxt Locale: sk_SK Language: Slovak License: BSD3c Types: hunspell, hyphen, thesaurus Version: 20100208.1 URL: http://extensions.services.openoffice.org/project/dict-sk Source: dict-sk.oxt Locale: sl_SI Language: Slovenian License: LGPLv2.1+ Types: thesaurus Version: 20080601.1 Source: thes_sl_SI_v2.tar.bz2 Locale: sv_SE Language: Swedish License: BSD3c Types: thesaurus Version: 20090624.1 # hunspell available: http://extensions.services.openoffice.org/project/dict-sv URL: http://extensions.services.openoffice.org/project/SweThes Source: SwedishThesaurus.oxt ++++++ libreoffice-thesaurus.spec.in ++++++ # # spec file for package libreoffice-thesaurus (Version 20070719) # # 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: libreoffice-thesaurus @DO_NOT_EDIT_COMMENT@ BuildRequires: dos2unix recode unzip License: @ALL_LICENSES@ Group: Productivity/Office/Dictionary AutoReqProv: on Version: 20110202 Release: 4 Summary: A Source Package for LibreOffice Thesaurus Dictionaries BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Url: http://wiki.services.openoffice.org/wiki/Dictionaries Source0: libreoffice-thesaurus-gen-spec Source1: libreoffice-thesaurus.spec.in Source2: libreoffice-thesaurus.data @SOURCES@ %description This source package is used to build LibreOffice thesaurus dictionaries. @METADATA@ %prep %setup -T -c # unpack sources for archive in \ @SOURCES_UNPACK@ ; do archive_name=`basename $archive | sed -e "s|.zip$||" -e "s|.oxt$||" -e "s|.tar.gz$||" -e "s|.tar.bz2$||"` mkdir $archive_name || exit 1; case $archive in *.zip|*.oxt) cd $archive_name; unzip $archive || exit 1; cd - ;; *.tar.gz) tar -xzf $archive -C $archive_name || exit 1; ;; *.tar.bz2) tar -xjf $archive -C $archive_name || exit 1; ;; *) echo "Error: Do not know how to uncompress $archive" exit 1; ;; esac done # # fix file names @PREP_HACKS@# # rename thes_ to th_ and add _v2 suffix for suffix in idx dat ; do for file in `find . -name "th*_*.$suffix" -type f` ; do dir=$(dirname $file) fname=$(basename $file) fname_new=`echo $fname | sed -e "s|^thes_|th_|" -e "s|\.$suffix$|_v2.$suffix|" -e "s|_v2_v2|_v2|"` test "$fname" = "$fname_new" || mv -v "$dir/$fname" "$dir/$fname_new" done done # # fix permissions find . -type f -exec chmod 644 {} \; %build %install rm -f filelist.template install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/mythes # compat dir install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/ooo/thesaurus for lang_dir in * ; do test -d $lang_dir || continue # temporary file list filelist=`mktemp /tmp/lo-thes-XXXXXX` echo "%%defattr(-,root,root)" >$filelist echo "%%dir %{_datadir}/mythes" >>$filelist # compat dir echo "%%dir %{_datadir}/ooo" >>$filelist echo "%%dir %{_datadir}/ooo/thesaurus" >>$filelist # install dictionaries dic= # support locales with 2 and 3 letters in the language code: th_ll_CC_v2.idx and th_lll_CC_v2.idx for idx in `find $lang_dir -regextype posix-extended -regex ".*/th_[[:lower:]][[:lower:]][[:lower:]]?_[[:upper:]][[:upper:]]_v2.idx" | sort` ; do dat=`echo $idx | sed -e "s|.idx$|.dat|"` if ! test -f $dat ; then echo "Warning: Found $idx but not $dat" echo "Skipping $idx" continue; fi # both .idx and .dat files exists => install them for f in $idx $dat ; do fname=$(basename $f) if test -f $RPM_BUILD_ROOT%{_datadir}/mythes/$fname ; then echo "Error: file already installed: $f" echo " Probably is provided by two source tarballs" exit 1; fi install -m 644 $f $RPM_BUILD_ROOT%{_datadir}/mythes/ echo %{_datadir}/mythes/$fname >>$filelist # compat stuff ln -sf ../../mythes/$fname $RPM_BUILD_ROOT%{_datadir}/ooo/thesaurus/ echo %{_datadir}/ooo/thesaurus/$fname >>$filelist done done # detect locale, lang and country if test -n $idx ; then # replace the underscore with a dot to be able to separate the language and the coutry code with the command "cut" dic_pname=`basename $idx | sed "s|_|.|g"` lang=`echo $dic_pname | cut -d "." -f2` country=`echo $dic_pname | cut -d "." -f3` else echo "Error: No dictionary found in $lang_dir" exit 1; fi locale="${lang}_${country}" # detect long language name case "$locale" in @LANG_NAME@ *) lang_name="$lang" ;; esac # detect README encoding case "$locale" in @ENCODING@ *) coding=`LC_CTYPE="$locale" locale -k LC_CTYPE | grep charmap | sed "s|charmap=\"$.*$\"\$|\1|"` ;; esac # install documentation docdir=%{_docdir}/libreoffice-thesaurus-$lang_name mkdir -p $RPM_BUILD_ROOT$docdir echo "%%doc $docdir" >>$filelist for doc in `find $lang_dir -type f -printf "%%P\n" | \ grep -v -e ".aff$" -e ".dic$" -e ".dat$" -e ".idx$" \ -e ".orig$" -e ".old$" -e "~$" \ -e ".sh$" -e "makefile" -e "META-INF"` ; do if ! test -f $lang_dir/$doc ; then echo "Error: is not a file: $lang_dir/$doc" exit 1; fi recode utf8..utf16 <$lang_dir/$doc >/dev/null 2>&1 || recode $coding..utf8 $lang_dir/$doc dos2unix $lang_dir/$doc dname=$(dirname $doc) install -m 755 -d $RPM_BUILD_ROOT$docdir/$dname install -m 644 $lang_dir/$doc $RPM_BUILD_ROOT$docdir/$dname done # rename the file list according to the detacted lang and country mv $filelist $locale.list # generate tempalte for the %files section echo "%%files -f $locale.list $lang_name" >>filelist.template echo "" >>filelist.template done %clean rm -rf $RPM_BUILD_ROOT @FILES@ %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 libreoffice-thesaurus for openSUSE:11.3
by root＠hilbert.suse.de 30 Mar '11

30 Mar '11

Hello community, here is the log from the commit of package libreoffice-thesaurus for openSUSE:11.3 checked in at Thu Mar 31 01:58:49 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/11.3/libreoffice-thesaurus/libreoffice-thesaurus.changes 2011-03-18 22:35:05.000000000 +0100 @@ -0,0 +1,79 @@ +------------------------------------------------------------------- +Fri Mar 18 22:12:32 CET 2011 - pmladek(a)suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Wed Feb 2 21:19:05 CET 2011 - pmladek(a)suse.cz + +- renamed from OpenOffice_org-thesaurus to libreoffice-thesaurus +- added provides locale(libreoffice:<lang>) to make it installed + with libreoffice (bnc#668145) +- installed files into /usr/share/mythes to be compatible with other + Linux distributions; added compat symlinks into the older location + /usr/share/ooo/thesaurus +- bumped version to make sure that it is considered as a replacement + of the older package + +------------------------------------------------------------------- +Fri Apr 9 20:28:50 CEST 2010 - pmladek(a)suse.cz + +- added dos2unix to BuildRequires; called on documentation files + +------------------------------------------------------------------- +Thu Apr 8 18:31:27 CEST 2010 - pmladek(a)suse.cz + +- updated: German, French, Irish, Polish, Portuguese, Romanian, Russian, + Slovak, Swedish, Swiss +- added: Austrian, Australian, Argentine Spanish, Catalan, Danish, Italian, + Venezuelan Spanish + +------------------------------------------------------------------- +Thu Apr 8 14:03:03 CEST 2010 - pmladek(a)suse.cz + +- more automatized packaging: + * added unzip to BuildRequires + * added support to repack dictionaries from different type of sources, + including OOo extensions + * added heuristics to install the documentation + * generated spec file using a script + * list all licenses for the source package + +------------------------------------------------------------------- +Tue Feb 9 17:34:07 CET 2010 - pmladek(a)suse.cz + +- fixed the license tag of the British dictionary + +------------------------------------------------------------------- +Tue Feb 9 17:27:12 CET 2010 - pmladek(a)suse.cz + +- renamed OpenOffice_org-en to OpenOffice_org-en-US to make the content clear + and avoid confusion with the new OpenOffice_org-en-GB + +------------------------------------------------------------------- +Mon Feb 06 16:57:05 CEST 2010 - kkemenczy(a)openssue.org + +- added: British (bnc#576443) + +------------------------------------------------------------------- +Mon Sep 29 17:56:01 CEST 2008 - pmladek(a)suse.cz + +- updated: French, Slovak, Romanian, Slovene +- added: Greek, Swedish +- removed obsolete triggerin and postun scripts; OOo-3.0 does not need + it anymore + +------------------------------------------------------------------- +Mon Apr 14 10:45:58 CEST 2008 - lmichnovic(a)suse.cz + +- update: bg_BG, cs_CZ, de_DE, nb_NO, sk_SK +- new packages: de_CH, ga_IE, hu_HU, ro_RO, ru_RU, sl_SI +- not removing $RPM_BUILD_ROOT in %install + +------------------------------------------------------------------- +Thu Jul 19 15:58:26 CEST 2007 - pmladek(a)suse.cz + +- split from the OpenOffice_org package +- source package version 20070719 +- updated: German, Polish +- added: Nepali calling whatdependson for 11.3-i586 New: ---- DanskeSynonymer.oxt Diccionarios-Argentina_1.oxt Dizionari.IT_20081129.oxt SwedishThesaurus.oxt dict-de_AT-frami_2010-03-07.oxt dict-de_CH-frami_2010-03-07.oxt dict-de_DE-frami_2010-03-07.oxt dict-en-au-2008-12-15.oxt dict-es_VE.oxt dict-ro.1.1.oxt dict-sk.oxt dict_ru_RU-0.3.4.oxt focloiri-gaeilge-4.4.oxt libreoffice-thesaurus-gen-spec libreoffice-thesaurus.changes libreoffice-thesaurus.data libreoffice-thesaurus.spec libreoffice-thesaurus.spec.in oo3x-pt-PT.oxt ooo-dictionnaire-fr-reforme1990-v3.5.oxt pl-dict.oxt th_el.tar.bz2 thes_bg_BG_v2.tar.bz2 thes_cs_CZ_v2.tar.bz2 thes_en_GB_v2.tar.bz2 thes_en_US_v2.tar.bz2 thes_es_ES_v2.tar.bz2 thes_hu_HU_v2.tar.bz2 thes_nb_NO_v2.tar.bz2 thes_ne_NP_v2.tar.bz2 thes_sl_SI_v2.tar.bz2 thesaurus-ca.oxt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-thesaurus.spec ++++++ ++++ 809 lines (skipped) ++++++ libreoffice-thesaurus-gen-spec ++++++ ++++ 621 lines (skipped) ++++++ libreoffice-thesaurus.data ++++++ # file format: # # comments are separated by # # # supported tags # Language: language name, e.g Catalan, German, Norwegian Bokmaal # pack_suffix: package name is normaly defined by the language name (lowercase, # underscore instread of space); you might define a non-standard one # using this tag, e.g norsk-bokmaal for Norwegian Bokmaal # Locale: locale supported by the dictionary, e.g ca_ES # Prov_lang: most dictionaries provides the language defined by the locale; # you might force the full locale using this tag; just mention # the full locale here again, e.g. de_DE vs de_AT # Version: package version, e.g. 2.1.5 # Source: source file name, e.g. catalan.oxt # License: comma separated list of dictionary licenses, e.g. GPLv2, LGPLv2.1 # Types: comma separated list of included dictionary types; possible values are: # myspell, hunspell, hyphen, thesaurus # URL: url where the dictionary sources was taken from, e.g. # http://extensions.services.openoffice.org/project/dict-catalan # Encoding: documentation files in non-UTF-8 enconding should be recoded; the original # encoding is guessed from the locale; you might define another encoding # here, e.g. ISO-8859-1 # dependency: extra dependency, e,g. Conflicts: myspell-german-old # Prep: extra hacks for the %prep section # the whole dictionary might be disabled on some distribution: use %if <condition> and %endif # around all tags related to the dictionary # the Version, Source, License tags might be conditional: use %if <condition>, %else, and %endif # to define the default and distro-specific values Locale: bg_BG Language: Bulgarian License: GPLv2+ Version: 20071210.1 Types: thesaurus # alternative url: http://extensions.services.openoffice.org/project/dictionaries-bg # dictionaries-bg.oxt, version 4.1.5 includes older thesaurus files => no update Url: http://sourceforge.net/projects/bgoffice # Extra source for Bulgarian dictionary because of missing license in # the version in the version available on the OOo site Source: thes_bg_BG_v2.tar.bz2 Locale: ca_ES Language: Catalan URL: http://extensions.services.openoffice.org/project/thesaurus-ca Version: 1.5.0.1 Types: hunspell License: GPLv2, LGPLv2.1 # TODO mail to the owner to solve this Prep: mv thesaurus-ca/dictionaries/README_th_ca_ES_v3.txt thesaurus-ca/dictionaries/README_th_ca_ES_v2.txt Prep: mv thesaurus-ca/dictionaries/th_ca_ES_v3.dat thesaurus-ca/dictionaries/th_ca_ES_v2.dat Prep: mv thesaurus-ca/dictionaries/th_ca_ES_v3.idx thesaurus-ca/dictionaries/th_ca_ES_v2.idx #, hunspell available: http://extensions.services.openoffice.org/project/dict-catalan #, thesaurus available: http://extensions.services.openoffice.org/project/thesaurus-ca Source: thesaurus-ca.oxt Locale: cs_CZ Language: Czech License: BSD3c Version: 20070913.1 Types: thesaurus # alternative url: http://extensions.services.openoffice.org/project/dict-cs # the thesaurus dictionary included in dict-cs-2.0.oxt is not freely redistributable # without asking author => FIXME: asked the author Source: thes_cs_CZ_v2.tar.bz2 Locale: da_DK Language: Danish URL: http://extensions.services.openoffice.org/project/danske_synonymer Version: 20100126.1 Types: thesaurus License: GPLv2, LGPLv2.1, MPLv1.1 # hunspell, hyphen available: http://extensions.services.openoffice.org/project/dict-da Source: DanskeSynonymer.oxt Locale: de_AT Language: Austrian pack_suffix: de-AT Prov_lang: de_AT URL: http://extensions.services.openoffice.org/project/dict-de_AT_frami Version: 20100307.1 Types: hunspell, hyphen, thesaurus License: LGPLv2.1+ Source: dict-de_AT-frami_2010-03-07.oxt Locale: de_CH Language: German-Swiss pack_suffix: de-CH Prov_lang: de_CH URL: http://extensions.services.openoffice.org/project/dict-de_CH_frami Version: 20100307.1 Types: hunspell, hyphen, thesaurus License: LGPLv2.1+ Source: dict-de_CH-frami_2010-03-07.oxt Locale: de_DE Language: German URL: http://extensions.services.openoffice.org/project/dict-de_DE_frami License: LGPLv2.1+ Version: 20100307.1 Types: hunspell, hyphen, thesaurus Source: dict-de_DE-frami_2010-03-07.oxt Locale: el_GR Language: Greek License: GPLv2+ Version: 20061203.1 Types: thesaurus Source: th_el.tar.bz2 Locale: en_AU Language: Australian Pack_suffix: en-AU Prov_lang: en_AU License: BSD4c Version: 20081215.1 Types: myspell, hyphen, thesaurus URL: http://extensions.services.openoffice.org/project/AustralianDictionary Source: dict-en-au-2008-12-15.oxt Locale: en_US Language: American Pack_suffix: en-US Prov_lang: en_US License: BSD4c Version: 20060111.1 Types: thesaurus Dependency: Provides: OpenOffice_org-thesaurus-en = 20060111 Dependency: Obsoletes: OpenOffice_org-thesaurus-en <= 20060111 Source: thes_en_US_v2.tar.bz2 Locale: en_GB Language: British Pack_suffix: en-GB Prov_lang: en_GB License: BSD4c Types: thesaurus Version: 20051128.1 Prep: mv thes_en_GB_v2/th_en_GB_final.dat thes_en_GB_v2/th_en_GB_v2.dat Prep: mv thes_en_GB_v2/th_en_GB_final.idx thes_en_GB_v2/th_en_GB_v2.idx # http://sourceforge.net/projects/brit-thesaurus/ Source: thes_en_GB_v2.tar.bz2 Locale: es_AR Language: Argentine Spanish pack_suffix: es-AR Prov_lang: es_AR URL: http://extensions.services.openoffice.org/project/diccionario_es_AR Version: 0.1.1 Types: myspell, hyphen, thesaurus License: LGPLv2.1 Source: Diccionarios-Argentina_1.oxt Locale: es_ES Language: Spanish License: LGPLv2.1+ Types: thesaurus Version: 20050720.1 Source: thes_es_ES_v2.tar.bz2 Locale: es_VE Language: Venezuelan Spanish pack_suffix: es-VE Prov_lang: es_VE URL: http://extensions.services.openoffice.org/project/dict-es_VE Version: 1.0.1.1 Types: hunspell, hyphen, thesaurus License: GPLv3+ Source: dict-es_VE.oxt Locale: fr_FR Language: French URL: http://extensions.services.openoffice.org/project/french-dictionary-classic… License: LGPLv2.1+ Version: 20100125.1 # 3.5 Types: myspell, hyphen, thesaurus # under investigation, it looks it belongs to several countries Prep: mv ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/thes_fr.dat ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/th_fr_FR_v2.dat Prep: mv ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/thes_fr.idx ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/th_fr_FR_v2.idx Source: ooo-dictionnaire-fr-reforme1990-v3.5.oxt Locale: ga_IE Language: Irish License: GFDLv1.2+ Types: thesaurus Version: 20071002.1 Types: hunspell, hyphen, thesaurus URL: http://extensions.services.openoffice.org/project/focloiri-gaeilge Source: focloiri-gaeilge-4.4.oxt Locale: hu_HU Language: Hungarian License: LGPLv2.1+ Types: thesaurus Version: 20080319.1 # from hu_HU-1.3-pack.zip Source: thes_hu_HU_v2.tar.bz2 Locale: it_IT Language: Italian URL: http://extensions.services.openoffice.org/project/Dict_it_IT Version: 20081129.1 Types: hunspell, hyphen, thesaurus License: AGPLv3+ Source: Dizionari.IT_20081129.oxt # FIXME: the thesaurus dictionary is almost empty #Locale: lv_LV #Language: Latvian #URL: http://extensions.services.openoffice.org/project/dict_lv_LV #Version: 20090916.1 # 0.8.2 #Types: hunspell, hyphen, thesaurus #License: LGPLv2.1 #Source: dict_lv_LV-0.8.2.oxt Locale: nb_NO Language: Norwegian Bokmaal License: GPLv2+ Types: thesaurus Version: 20080310.1 # from no_NO-pack2-2.0.10.zip Source: thes_nb_NO_v2.tar.bz2 Locale: ne_NP Language: Nepali License: LGPLv2.1+ Types: thesaurus Version: 1.1.1 Source: thes_ne_NP_v2.tar.bz2 Locale: pl_PL Language: Polish URL: http://extensions.services.openoffice.org/project/pl-dict License: LGPLv2.1 Types: myspell, hyphen, thesaurus Version: 20081206.1 Source: pl-dict.oxt Locale: pt_PT Language: Portuguese License: GPLv2+ Types: hunspell, hyphen, thesaurus Version: 20091015.1 URL: http://extensions.services.openoffice.org/project/ptPTdict Source: oo3x-pt-PT.oxt Locale: ro_RO Language: Romanian License: GPLv2+ Types: hunspell, hyphen, thesaurus Version: 20091130.1 URL: http://extensions.services.openoffice.org/project/dictionaries-ro-contempor… Source: dict-ro.1.1.oxt Locale: ru_RU Language: Russian License: LGPLv3 Types: myspell, hyphen, thesaurus Version: 20081013.1 # TODO no source URL Source: dict_ru_RU-0.3.4.oxt Locale: sk_SK Language: Slovak License: BSD3c Types: hunspell, hyphen, thesaurus Version: 20100208.1 URL: http://extensions.services.openoffice.org/project/dict-sk Source: dict-sk.oxt Locale: sl_SI Language: Slovenian License: LGPLv2.1+ Types: thesaurus Version: 20080601.1 Source: thes_sl_SI_v2.tar.bz2 Locale: sv_SE Language: Swedish License: BSD3c Types: thesaurus Version: 20090624.1 # hunspell available: http://extensions.services.openoffice.org/project/dict-sv URL: http://extensions.services.openoffice.org/project/SweThes Source: SwedishThesaurus.oxt ++++++ libreoffice-thesaurus.spec.in ++++++ # # spec file for package libreoffice-thesaurus (Version 20070719) # # 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: libreoffice-thesaurus @DO_NOT_EDIT_COMMENT@ BuildRequires: dos2unix recode unzip License: @ALL_LICENSES@ Group: Productivity/Office/Dictionary AutoReqProv: on Version: 20110202 Release: 4 Summary: A Source Package for LibreOffice Thesaurus Dictionaries BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Url: http://wiki.services.openoffice.org/wiki/Dictionaries Source0: libreoffice-thesaurus-gen-spec Source1: libreoffice-thesaurus.spec.in Source2: libreoffice-thesaurus.data @SOURCES@ %description This source package is used to build LibreOffice thesaurus dictionaries. @METADATA@ %prep %setup -T -c # unpack sources for archive in \ @SOURCES_UNPACK@ ; do archive_name=`basename $archive | sed -e "s|.zip$||" -e "s|.oxt$||" -e "s|.tar.gz$||" -e "s|.tar.bz2$||"` mkdir $archive_name || exit 1; case $archive in *.zip|*.oxt) cd $archive_name; unzip $archive || exit 1; cd - ;; *.tar.gz) tar -xzf $archive -C $archive_name || exit 1; ;; *.tar.bz2) tar -xjf $archive -C $archive_name || exit 1; ;; *) echo "Error: Do not know how to uncompress $archive" exit 1; ;; esac done # # fix file names @PREP_HACKS@# # rename thes_ to th_ and add _v2 suffix for suffix in idx dat ; do for file in `find . -name "th*_*.$suffix" -type f` ; do dir=$(dirname $file) fname=$(basename $file) fname_new=`echo $fname | sed -e "s|^thes_|th_|" -e "s|\.$suffix$|_v2.$suffix|" -e "s|_v2_v2|_v2|"` test "$fname" = "$fname_new" || mv -v "$dir/$fname" "$dir/$fname_new" done done # # fix permissions find . -type f -exec chmod 644 {} \; %build %install rm -f filelist.template install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/mythes # compat dir install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/ooo/thesaurus for lang_dir in * ; do test -d $lang_dir || continue # temporary file list filelist=`mktemp /tmp/lo-thes-XXXXXX` echo "%%defattr(-,root,root)" >$filelist echo "%%dir %{_datadir}/mythes" >>$filelist # compat dir echo "%%dir %{_datadir}/ooo" >>$filelist echo "%%dir %{_datadir}/ooo/thesaurus" >>$filelist # install dictionaries dic= # support locales with 2 and 3 letters in the language code: th_ll_CC_v2.idx and th_lll_CC_v2.idx for idx in `find $lang_dir -regextype posix-extended -regex ".*/th_[[:lower:]][[:lower:]][[:lower:]]?_[[:upper:]][[:upper:]]_v2.idx" | sort` ; do dat=`echo $idx | sed -e "s|.idx$|.dat|"` if ! test -f $dat ; then echo "Warning: Found $idx but not $dat" echo "Skipping $idx" continue; fi # both .idx and .dat files exists => install them for f in $idx $dat ; do fname=$(basename $f) if test -f $RPM_BUILD_ROOT%{_datadir}/mythes/$fname ; then echo "Error: file already installed: $f" echo " Probably is provided by two source tarballs" exit 1; fi install -m 644 $f $RPM_BUILD_ROOT%{_datadir}/mythes/ echo %{_datadir}/mythes/$fname >>$filelist # compat stuff ln -sf ../../mythes/$fname $RPM_BUILD_ROOT%{_datadir}/ooo/thesaurus/ echo %{_datadir}/ooo/thesaurus/$fname >>$filelist done done # detect locale, lang and country if test -n $idx ; then # replace the underscore with a dot to be able to separate the language and the coutry code with the command "cut" dic_pname=`basename $idx | sed "s|_|.|g"` lang=`echo $dic_pname | cut -d "." -f2` country=`echo $dic_pname | cut -d "." -f3` else echo "Error: No dictionary found in $lang_dir" exit 1; fi locale="${lang}_${country}" # detect long language name case "$locale" in @LANG_NAME@ *) lang_name="$lang" ;; esac # detect README encoding case "$locale" in @ENCODING@ *) coding=`LC_CTYPE="$locale" locale -k LC_CTYPE | grep charmap | sed "s|charmap=\"$.*$\"\$|\1|"` ;; esac # install documentation docdir=%{_docdir}/libreoffice-thesaurus-$lang_name mkdir -p $RPM_BUILD_ROOT$docdir echo "%%doc $docdir" >>$filelist for doc in `find $lang_dir -type f -printf "%%P\n" | \ grep -v -e ".aff$" -e ".dic$" -e ".dat$" -e ".idx$" \ -e ".orig$" -e ".old$" -e "~$" \ -e ".sh$" -e "makefile" -e "META-INF"` ; do if ! test -f $lang_dir/$doc ; then echo "Error: is not a file: $lang_dir/$doc" exit 1; fi recode utf8..utf16 <$lang_dir/$doc >/dev/null 2>&1 || recode $coding..utf8 $lang_dir/$doc dos2unix $lang_dir/$doc dname=$(dirname $doc) install -m 755 -d $RPM_BUILD_ROOT$docdir/$dname install -m 644 $lang_dir/$doc $RPM_BUILD_ROOT$docdir/$dname done # rename the file list according to the detacted lang and country mv $filelist $locale.list # generate tempalte for the %files section echo "%%files -f $locale.list $lang_name" >>filelist.template echo "" >>filelist.template done %clean rm -rf $RPM_BUILD_ROOT @FILES@ %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 libreoffice-templates-labels for openSUSE:11.2
by root＠hilbert.suse.de 30 Mar '11

30 Mar '11

Hello community, here is the log from the commit of package libreoffice-templates-labels for openSUSE:11.2 checked in at Thu Mar 31 01:57:12 CEST 2011. Wide character in print at /work/src/bin/tools/get_bugzilla line 45. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/11.2/libreoffice-templates-labels/libreoffice-templates-labels.changes 2011-03-18 22:34:50.000000000 +0100 @@ -0,0 +1,46 @@ +------------------------------------------------------------------- +Fri Mar 18 22:12:32 CET 2011 - pmladek(a)suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Fri Feb 18 19:49:32 CET 2011 - pmladek(a)suse.cz + +- bumped version to make sure that it is considered as a replacement + of the older package + +------------------------------------------------------------------- +Thu Feb 3 19:23:15 CET 2011 - pmladek(a)suse.cz + +- renamed from OpenOffice_org-templates-* to libreoffice-templates-* +- added supplements libreoffice to make it installed + with libreoffice (bnc#668145) +- installed files into /usr/share/templates/libreoffice +- added compat symlinks into the older location /usr/share/templates/ooo; + note that /usr/share/templates/ooo2 did not work with OOo-3.x + +------------------------------------------------------------------- +Mon May 5 12:16:20 CEST 2008 - ro(a)suse.de + +- add Version and Release lines for subpackages as there is no + main package built + +------------------------------------------------------------------- +Wed Apr 25 19:28:12 CEST 2007 - stbinner(a)suse.de + +- fix build on SUSE Linux 10.0 + +------------------------------------------------------------------- +Mon Nov 6 18:08:50 CET 2006 - pmladek(a)suse.cz + +- updated to snapshot 20061106: + * use tables instead of frames for A4 lables; it solves many issues with + adjusting them if there are printer alignment problems + * better titles and file names + * add README and COPYING files + +------------------------------------------------------------------- +Mon Oct 23 12:54:47 CEST 2006 - pmladek(a)suse.cz + +- new package, version 1.0 + calling whatdependson for 11.2-i586 New: ---- OOoLabel-Templates-20061106.tar.bz2 libreoffice-templates-labels.changes libreoffice-templates-labels.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-templates-labels.spec ++++++ # # spec file for package libreoffice-templates-labels # # Copyright (c) 2011 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: libreoffice-templates-labels License: GPLv2+ Group: Productivity/Office/Suite AutoReqProv: on Version: 1.0.1 Release: 1.<RELEASE2> Summary: Label Templates for LibreOffice Url: http://sourceforge.net/projects/ooolabels Source: OOoLabel-Templates-20061106.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description This source package includes a collection of label templates for LibreOffice. %package a4 License: GPLv2+ Version: 1.0.1 Release: 1.<RELEASE2> Group: Productivity/Office/Suite Summary: A4 Size Label Templates for LibreOffice %if %suse_version > 1000 Supplements: OpenOffice_org Supplements: libreoffice %endif # compat stuff Provides: OpenOffice_org-templates-labels-a4 = %version Obsoletes: OpenOffice_org-templates-labels-a4 <= %version %description a4 A collection of A4 size label templates for LibreOffice. They are intended for Europe and Asia. %package letter License: GPLv2+ Version: 1.0.1 Release: 1.<RELEASE2> Group: Productivity/Office/Suite Summary: Letter Size Label Templates for LibreOffice %if %suse_version > 1000 Supplements: OpenOffice_org Supplements: libreoffice %endif # compat stuff Provides: OpenOffice_org-templates-labels-letter = %version Obsoletes: OpenOffice_org-templates-labels-letter <= %version %description letter A collection of letter size label templates for LibreOffice. They are intended for US. %prep %setup -c -q %build %install install -m 755 -d $RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/ cp -a Europe-Asia-a4-sizes-OOolabels/* $RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/ cp -a USA-a5-sizes-OOolabels/* $RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/ # # move documentation install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-a4 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter mv "$RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/Europe-Asia-a4-Sizes-README.ott" $RPM_BUILD_ROOT/%{_docdir}/%{name}-a4 mv "$RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/USA-sizes-A5-README-OOoLabels.ott" $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter mv "$RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/Worldlabel.com Label Configurations.ods" $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter # compat stuff install -m 755 -d $RPM_BUILD_ROOT/usr/share/templates/ooo/ for dir in `find $RPM_BUILD_ROOT/usr/share/templates/libreoffice/ -type d -printf "%%P \n"` ; do echo "~$RPM_BUILD_ROOT/usr/share/templates/ooo/$dir~" mkdir -p $RPM_BUILD_ROOT/usr/share/templates/ooo/$dir done for file in `find $RPM_BUILD_ROOT/usr/share/templates/libreoffice/ -type f -printf "%%P "` ; do ln -sf /usr/share/templates/libreoffice/$file $RPM_BUILD_ROOT/usr/share/templates/ooo/$file done # # create file lists # a4 ls Europe-Asia-a4-sizes-OOolabels/* | \ grep -v -e "Europe-Asia-a4-Sizes-README.ott" | \ sed "s|^Europe-Asia-a4-sizes-OOolabels/$.*$$|\"/usr/share/templates/libreoffice/common/labels/\1\"|" >a4.list # a4 compat stuff ls Europe-Asia-a4-sizes-OOolabels/* | \ grep -v -e "Europe-Asia-a4-Sizes-README.ott" | \ sed "s|^Europe-Asia-a4-sizes-OOolabels/$.*$$|\"/usr/share/templates/ooo/common/labels/\1\"|" >>a4.list # a4 doc echo "%doc \"%{_docdir}/%{name}-a4/Europe-Asia-a4-Sizes-README.ott\"" >>a4.list # letter ls USA-a5-sizes-OOolabels/* | \ grep -v -e "USA-sizes-A5-README-OOoLabels.ott" -e "Worldlabel.com Label Configurations.ods" | \ sed "s|^USA-a5-sizes-OOolabels/$.*$$|\"/usr/share/templates/libreoffice/common/labels/\1\"|" >letter.list # letter compat stuff ls USA-a5-sizes-OOolabels/* | \ grep -v -e "USA-sizes-A5-README-OOoLabels.ott" -e "Worldlabel.com Label Configurations.ods" | \ sed "s|^USA-a5-sizes-OOolabels/$.*$$|\"/usr/share/templates/ooo/common/labels/\1\"|" >>letter.list # letter doc echo "%doc \"%{_docdir}/%{name}-letter/USA-sizes-A5-README-OOoLabels.ott\"" >>letter.list echo "%doc \"%{_docdir}/%{name}-letter/Worldlabel.com Label Configurations.ods\"" >>letter.list # # README and COPYING for file in README COPYING ; do cp -a $file $RPM_BUILD_ROOT/%{_docdir}/%{name}-a4/ cp -a $file $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter/ echo "%doc \"%{_docdir}/%{name}-a4/$file\"" >>a4.list echo "%doc \"%{_docdir}/%{name}-letter/$file\"" >>letter.list done %clean rm -rf $RPM_BUILD_ROOT %files -f a4.list a4 %defattr(-, root, root) %doc %dir %{_docdir}/%{name}-a4 %dir /usr/share/templates/libreoffice/ %dir /usr/share/templates/libreoffice/common/ %dir /usr/share/templates/libreoffice/common/labels/ # compat stuff %dir /usr/share/templates/ooo/ %dir /usr/share/templates/ooo/common/ %dir /usr/share/templates/ooo/common/labels/ %files -f letter.list letter %defattr(-, root, root) %doc %dir %{_docdir}/%{name}-letter %dir /usr/share/templates/ %dir /usr/share/templates/libreoffice/ %dir /usr/share/templates/libreoffice/common/ %dir /usr/share/templates/libreoffice/common/labels/ # compat stuff %dir /usr/share/templates/ooo/ %dir /usr/share/templates/ooo/common/ %dir /usr/share/templates/ooo/common/labels/ %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 libreoffice-templates-labels for openSUSE:11.3
by root＠hilbert.suse.de 30 Mar '11

30 Mar '11

Hello community, here is the log from the commit of package libreoffice-templates-labels for openSUSE:11.3 checked in at Thu Mar 31 01:56:57 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/11.3/libreoffice-templates-labels/libreoffice-templates-labels.changes 2011-03-18 22:34:50.000000000 +0100 @@ -0,0 +1,46 @@ +------------------------------------------------------------------- +Fri Mar 18 22:12:32 CET 2011 - pmladek(a)suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Fri Feb 18 19:49:32 CET 2011 - pmladek(a)suse.cz + +- bumped version to make sure that it is considered as a replacement + of the older package + +------------------------------------------------------------------- +Thu Feb 3 19:23:15 CET 2011 - pmladek(a)suse.cz + +- renamed from OpenOffice_org-templates-* to libreoffice-templates-* +- added supplements libreoffice to make it installed + with libreoffice (bnc#668145) +- installed files into /usr/share/templates/libreoffice +- added compat symlinks into the older location /usr/share/templates/ooo; + note that /usr/share/templates/ooo2 did not work with OOo-3.x + +------------------------------------------------------------------- +Mon May 5 12:16:20 CEST 2008 - ro(a)suse.de + +- add Version and Release lines for subpackages as there is no + main package built + +------------------------------------------------------------------- +Wed Apr 25 19:28:12 CEST 2007 - stbinner(a)suse.de + +- fix build on SUSE Linux 10.0 + +------------------------------------------------------------------- +Mon Nov 6 18:08:50 CET 2006 - pmladek(a)suse.cz + +- updated to snapshot 20061106: + * use tables instead of frames for A4 lables; it solves many issues with + adjusting them if there are printer alignment problems + * better titles and file names + * add README and COPYING files + +------------------------------------------------------------------- +Mon Oct 23 12:54:47 CEST 2006 - pmladek(a)suse.cz + +- new package, version 1.0 + calling whatdependson for 11.3-i586 New: ---- OOoLabel-Templates-20061106.tar.bz2 libreoffice-templates-labels.changes libreoffice-templates-labels.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-templates-labels.spec ++++++ # # spec file for package libreoffice-templates-labels # # Copyright (c) 2011 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: libreoffice-templates-labels License: GPLv2+ Group: Productivity/Office/Suite AutoReqProv: on Version: 1.0.1 Release: 1.<RELEASE2> Summary: Label Templates for LibreOffice Url: http://sourceforge.net/projects/ooolabels Source: OOoLabel-Templates-20061106.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description This source package includes a collection of label templates for LibreOffice. %package a4 License: GPLv2+ Version: 1.0.1 Release: 1.<RELEASE2> Group: Productivity/Office/Suite Summary: A4 Size Label Templates for LibreOffice %if %suse_version > 1000 Supplements: OpenOffice_org Supplements: libreoffice %endif # compat stuff Provides: OpenOffice_org-templates-labels-a4 = %version Obsoletes: OpenOffice_org-templates-labels-a4 <= %version %description a4 A collection of A4 size label templates for LibreOffice. They are intended for Europe and Asia. %package letter License: GPLv2+ Version: 1.0.1 Release: 1.<RELEASE2> Group: Productivity/Office/Suite Summary: Letter Size Label Templates for LibreOffice %if %suse_version > 1000 Supplements: OpenOffice_org Supplements: libreoffice %endif # compat stuff Provides: OpenOffice_org-templates-labels-letter = %version Obsoletes: OpenOffice_org-templates-labels-letter <= %version %description letter A collection of letter size label templates for LibreOffice. They are intended for US. %prep %setup -c -q %build %install install -m 755 -d $RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/ cp -a Europe-Asia-a4-sizes-OOolabels/* $RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/ cp -a USA-a5-sizes-OOolabels/* $RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/ # # move documentation install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-a4 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter mv "$RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/Europe-Asia-a4-Sizes-README.ott" $RPM_BUILD_ROOT/%{_docdir}/%{name}-a4 mv "$RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/USA-sizes-A5-README-OOoLabels.ott" $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter mv "$RPM_BUILD_ROOT/usr/share/templates/libreoffice/common/labels/Worldlabel.com Label Configurations.ods" $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter # compat stuff install -m 755 -d $RPM_BUILD_ROOT/usr/share/templates/ooo/ for dir in `find $RPM_BUILD_ROOT/usr/share/templates/libreoffice/ -type d -printf "%%P \n"` ; do echo "~$RPM_BUILD_ROOT/usr/share/templates/ooo/$dir~" mkdir -p $RPM_BUILD_ROOT/usr/share/templates/ooo/$dir done for file in `find $RPM_BUILD_ROOT/usr/share/templates/libreoffice/ -type f -printf "%%P "` ; do ln -sf /usr/share/templates/libreoffice/$file $RPM_BUILD_ROOT/usr/share/templates/ooo/$file done # # create file lists # a4 ls Europe-Asia-a4-sizes-OOolabels/* | \ grep -v -e "Europe-Asia-a4-Sizes-README.ott" | \ sed "s|^Europe-Asia-a4-sizes-OOolabels/$.*$$|\"/usr/share/templates/libreoffice/common/labels/\1\"|" >a4.list # a4 compat stuff ls Europe-Asia-a4-sizes-OOolabels/* | \ grep -v -e "Europe-Asia-a4-Sizes-README.ott" | \ sed "s|^Europe-Asia-a4-sizes-OOolabels/$.*$$|\"/usr/share/templates/ooo/common/labels/\1\"|" >>a4.list # a4 doc echo "%doc \"%{_docdir}/%{name}-a4/Europe-Asia-a4-Sizes-README.ott\"" >>a4.list # letter ls USA-a5-sizes-OOolabels/* | \ grep -v -e "USA-sizes-A5-README-OOoLabels.ott" -e "Worldlabel.com Label Configurations.ods" | \ sed "s|^USA-a5-sizes-OOolabels/$.*$$|\"/usr/share/templates/libreoffice/common/labels/\1\"|" >letter.list # letter compat stuff ls USA-a5-sizes-OOolabels/* | \ grep -v -e "USA-sizes-A5-README-OOoLabels.ott" -e "Worldlabel.com Label Configurations.ods" | \ sed "s|^USA-a5-sizes-OOolabels/$.*$$|\"/usr/share/templates/ooo/common/labels/\1\"|" >>letter.list # letter doc echo "%doc \"%{_docdir}/%{name}-letter/USA-sizes-A5-README-OOoLabels.ott\"" >>letter.list echo "%doc \"%{_docdir}/%{name}-letter/Worldlabel.com Label Configurations.ods\"" >>letter.list # # README and COPYING for file in README COPYING ; do cp -a $file $RPM_BUILD_ROOT/%{_docdir}/%{name}-a4/ cp -a $file $RPM_BUILD_ROOT/%{_docdir}/%{name}-letter/ echo "%doc \"%{_docdir}/%{name}-a4/$file\"" >>a4.list echo "%doc \"%{_docdir}/%{name}-letter/$file\"" >>letter.list done %clean rm -rf $RPM_BUILD_ROOT %files -f a4.list a4 %defattr(-, root, root) %doc %dir %{_docdir}/%{name}-a4 %dir /usr/share/templates/libreoffice/ %dir /usr/share/templates/libreoffice/common/ %dir /usr/share/templates/libreoffice/common/labels/ # compat stuff %dir /usr/share/templates/ooo/ %dir /usr/share/templates/ooo/common/ %dir /usr/share/templates/ooo/common/labels/ %files -f letter.list letter %defattr(-, root, root) %doc %dir %{_docdir}/%{name}-letter %dir /usr/share/templates/ %dir /usr/share/templates/libreoffice/ %dir /usr/share/templates/libreoffice/common/ %dir /usr/share/templates/libreoffice/common/labels/ # compat stuff %dir /usr/share/templates/ooo/ %dir /usr/share/templates/ooo/common/ %dir /usr/share/templates/ooo/common/labels/ %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