August 2009 - openSUSE Commits - openSUSE Mailing Lists

commit tulip for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at Mon Aug 3 16:56:28 CEST 2009. -------- --- tulip/tulip.changes 2009-06-15 10:57:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/tulip/tulip.changes 2009-07-29 10:34:19.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 21 23:49:48 CEST 2009 - dominique-obs(a)leuenberger.net + +- Update to version 3.2.0 + + This is a minor release with many performance improvements and + bugfixes. + + The ability to configure an HTTP proxy was added in the plugins + manager. +- Drop tulip-3.1.1.dif + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tulip-3.1.1-devHandbook.pdf tulip-3.1.1-userManual.pdf tulip-3.1.1.dif tulip-3.1.1.tar.bz2 New: ---- tulip-3.2.0-devHandbook.pdf tulip-3.2.0-userManual.pdf tulip-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.IaOSxO/_old 2009-08-03 16:55:36.000000000 +0200 +++ /var/tmp/diff_new_pack.IaOSxO/_new 2009-08-03 16:55:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tulip (Version 3.1.1) +# spec file for package tulip (Version 3.2.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,11 +27,11 @@ BuildRequires: fdupes %endif Summary: Visualization of huge graphs -Version: 3.1.1 -Release: 2 +Version: 3.2.0 +Release: 1 Prefix: /usr # .so version -%define tulip_version 3.1 +%define tulip_version 3.2 %define datadir %{prefix}/share %define pkgdatadir %{prefix}/share/tulip Url: http://www.tulip-software.org @@ -40,7 +40,6 @@ Source2: tulip-%{version}-userManual.pdf Source3: tulip-%{version}-devHandbook.pdf Source4: tulip-rpmlintrc -Patch: tulip-%{version}.dif License: GPL v2 or later Group: Productivity/Graphics/Visualization/Graph Requires: Mesa @@ -272,8 +271,7 @@ Poset Import plug-in Luis Garcia. %prep -%setup -q -n tulip-%{version} -%patch +%setup -q %build %{?suse_update_config:%{suse_update_config -f}} @@ -382,7 +380,7 @@ %{_libdir}/tlp/libEmbedder-%{version}.* %{_libdir}/tlp/libEqualValueClustering-%{version}.* %{_libdir}/tlp/libGemLayout-%{version}.* -%{_libdir}/tlp/libGeneralGraph3D-%{version}.* +%{_libdir}/tlp/libHierarchicalGraph-%{version}.* %{_libdir}/tlp/libGMLExport-%{version}.* %{_libdir}/tlp/libGMLImport-%{version}.* %{_libdir}/tlp/libGrid-%{version}.* @@ -451,8 +449,9 @@ %files devel %defattr(-,root,root) %{datadir}/aclocal/tulip.m4 -%dir %{prefix}/include/tulip -%{prefix}/include/tulip/* +%dir %{_includedir}/tulip +%{_includedir}/tulip/* +%{_includedir}/ParallelCoords*.h %files devel-doc %defattr(-,root,root) ++++++ tulip-3.1.1-devHandbook.pdf -> tulip-3.2.0-devHandbook.pdf ++++++ (binary differes) ++++++ tulip-3.1.1-userManual.pdf -> tulip-3.2.0-userManual.pdf ++++++ (binary differes) ++++++ tulip-3.1.1.tar.bz2 -> tulip-3.2.0.tar.bz2 ++++++ tulip/tulip-3.1.1.tar.bz2 /mounts/work_src_done/STABLE/tulip/tulip-3.2.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 ndiswrapper for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package ndiswrapper for openSUSE:Factory checked in at Mon Aug 3 16:55:20 CEST 2009. -------- --- ndiswrapper/ndiswrapper.changes 2009-03-11 13:21:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/ndiswrapper/ndiswrapper.changes 2009-08-03 15:30:41.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Aug 3 15:27:34 CEST 2009 - coolo(a)novell.com + +- update to 1.55 + * Fixed compilation issues with recent kernels + * Fixed buffer overflows with nickname + * Compilation issues with 2.6.27 and 2.6.28 fixed +- removing all our patches that are solved upstream + +------------------------------------------------------------------- +Sun Aug 2 18:23:34 CEST 2009 - coolo(a)novell.com + +- convert net_device API to 2.6.31 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ndiswrapper-1.53.tar.bz2 ndiswrapper-iwe_info.patch ndiswrapper-long-essid.patch New: ---- ndiswrapper-1.55.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndiswrapper.spec ++++++ --- /var/tmp/diff_new_pack.PFC7Mt/_old 2009-08-03 16:55:09.000000000 +0200 +++ /var/tmp/diff_new_pack.PFC7Mt/_new 2009-08-03 16:55:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ndiswrapper (Version 1.53) +# spec file for package ndiswrapper (Version 1.55) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,21 +23,19 @@ Group: System/Kernel AutoReqProv: on Summary: Use Microsoft NDIS Network Drivers for WLAN Cards -Version: 1.53 -Release: 13 +Version: 1.55 +Release: 1 Requires: pciutils Requires: ndiswrapper-kmp Source0: %name-%version.tar.bz2 Source2: README.SUSE Source3: preamble Patch0: ndiswrapper.diff -Patch1: ndiswrapper-iwe_info.patch -Patch2: ndiswrapper-long-essid.patch Url: http://ndiswrapper.sourceforge.net License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 -%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug +#%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug %description Some wireless LAN vendors refuse to release hardware specifications or @@ -73,8 +71,6 @@ %prep %setup %patch0 -%patch1 -%patch2 -p0 cp %SOURCE2 . mkdir obj ++++++ ndiswrapper-1.53.tar.bz2 -> ndiswrapper-1.55.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/ChangeLog new/ndiswrapper-1.55/ChangeLog --- old/ndiswrapper-1.53/ChangeLog 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/ChangeLog 2009-06-29 04:09:27.000000000 +0200 @@ -1,31 +1,40 @@ +Version 1.55 2009-06-28 +======================= +* Fixed compilation issues with recent kernels + +Version 1.54 2009-01-21 +======================= +* Fixed buffer overflows with nickname +* Compilation issues with 2.6.27 and 2.6.28 fixed + Version 1.53 2008-05-17 -======================= -* Implemented va_list conversion for x86_64, which fixes oops in +======================= +* Implemented va_list conversion for x86_64, which fixes oops in vsprintf() and vsnprintf(). * Fixed oops on unload if using our workqueue implementation with SMP enabled. * Don't change the actual thread priority, just pretend it was changed. -* Implemented format string conversion for x86_64, so that Windows long +* Implemented format string conversion for x86_64, so that Windows long is mapped to Linux int. * Fixed most sparse warnings. -* Simplified code and build system to remove already broken support for +* Simplified code and build system to remove already broken support for Linux versions prior to 2.6.16. -* Added .size and .type for all functions in win2lin_stubs.S to improve +* Added .size and .type for all functions in win2lin_stubs.S to improve backtrace on x86_64. * Fixed rx key authentication sequence number conversion from Windows to Linux so WPA authentication doesn't sometimes go into re-key auth loop. Version 1.52 2008-02-02 -======================= +======================= * Fixed kernel crash when CONFIG_DEBUG_SHIRQ is enabled * Compilation issues with current 2.6.25 kernel tree fixed Version 1.51 2007-12-17 -======================= +======================= * Fixed an smp issue that may cause ndiswrapper to stop transmitting packets after a while (noticed with Marvell Pre-N USB driver) Version 1.50 2007-11-27 -======================= +======================= * Added support for 2.6.24-rcX kernels * Fixed issue with changing mac address (with 'ifconfig <iface> hw ether <mac>') - its broken since 1.45-rc2. Now one can also edit appropriate .conf @@ -34,7 +43,7 @@ * Fixed kernel crash observed with mrv8335 in ad-hoc mode Version 1.49 2007-10-27 -======================= +======================= * If a driver returns invalid MAC address (00:00:00:00:00) when queried with OID_802_3_CURRENT_ADDRESS (probably because NdisReadNetworkAddress returns NDIS_STATUS_FAILURE?), use @@ -46,7 +55,7 @@ * Dropped support for 2.4 kernels (and very old 2.6 kernels) Version 1.48 2007-09-19 -======================= +======================= * Support for 2.6.23 kernel * Disassocation with wpa_supplicant is fixed (earlier, after disassociation, the driver and ndiswrapper would be configured differently, requiring @@ -57,17 +66,17 @@ to take up all the CPU in some cases Version 1.47 2007-06-12 -======================= +======================= * Fixed random (occassional) crash issues with 64-bit drivers (observed with Broadcom driver) * Fixed compilation issues with version 1.46 Version 1.46 2007-06-03 -======================= +======================= * Fixed crash with large transfers (bug in version 1.45) Version 1.45 2007-05-28 -======================= +======================= * Fixes 'NOHZ: local_softirq_pending: 08' warnings from tickless kernels * Fixed issue(s) with RT-preempt enabled kernels @@ -86,7 +95,7 @@ * Fixed crashes when removing module with usb devices Version 1.44 2007-05-17 -======================= +======================= * Fixed issues with Ubuntu kernels (where PREEMPT is not enabled) * Issues with combination of DEBUG_PREEMPT and RT-preempt fixed * Fixed issues with newer 64-bit Broadcom driver when more than 1GB RAM is @@ -94,7 +103,7 @@ * Added support for upcoming 2.6.22 kernels Version 1.43 2007-04-30 -======================= +======================= * Fixed long standing memory allocation issues with some drivers, Atheros especially. With this fix, Atheros cards in Macbook with Core 2 Duo are known to work @@ -107,24 +116,24 @@ in-kernel sky2 driver has some issues) Version 1.42 2007-04-16 -======================= +======================= * Yet another smp fix * Bug fix related to events (no driver seems to be affected by this) Version 1.41 2007-03-31 -======================= +======================= * Fixed soft-lockup issue when multiple network devices are used * Fixed a bug when unloading driver * Fixed issues with recent RT-preempt patch Version 1.40 2007-03-29 -======================= +======================= * The workaround for large memory allocations (needed by Atheros drivers) with 2.6.19+ kernels, introduced in version 1.33, causes soft-lockup with smp. This is now fixed. Version 1.39 2007-03-23 -======================= +======================= * An smp issue is fixed * When initializing a card that supports 802.11a and either 802.11g or b, set the mode to 802.11g or b, as 802.11a is far less common @@ -132,66 +141,66 @@ * Fixed issue with initializing athfmwdl driver (for atheros USB cards) Version 1.38 2007-02-28 -======================= +======================= * Fixed ndiswrapper script so it installs drivers for certain PCMCIA cards (which have bus type 8, instead of 5) * Fixed compilation issues with 2.4 kernels Version 1.37 2007-02-02 -======================= +======================= * This time, really fixed the ndiswrapper script for sis163u driver (wrong version was packaged with 1.36, although issue was fixed in svn a few days ago) Version 1.36 2007-02-01 -======================= +======================= * Fixed ndiswrapper script (broken since 1.23 for sis163u driver) * Implemented full scatter/gather lists (not tested) * Implemented support for hardware tcp/ip checksumming (through NDIS) Version 1.35 2007-01-28 -======================= +======================= * Fixed a bug with scatter/gather. With this rt61 from RaLink and VT6655 from VIA drivers transmit data. Other drivers that associated but didn't transmit data (e.g., RT8855, Airgo's Gen3 PCI with ID 17CB:0002) may also work. Version 1.34 2007-01-08 -======================= +======================= * Provide workaround for large memory allocations in interrupt context with 2.6.19+ kernels. With this, atheros (and other?) drivers don't need kernel to be patched. Version 1.33 2006-12-28 -======================= +======================= * Allow large memory allocations in older kernels; with 2.6.19 and newer kernels, vmalloc in atomic allocations is not allowed (see 'patches' section on project page for workaround on these newer kernels). Version 1.32 2006-12-23 -======================= +======================= * Added compatability with 2.6.20-rc1 kernel * Fixed crash when changing MAC address (with 'ifconfig hw ether') * Fixed crash when names of other network device are changed (e.g., by udev) Version 1.31 2006-12-05 -======================= +======================= * Fixed crashes with shutting down computer without unloading ndiswrapper module. * Added support for Davicom 9601 USB ethernet device. * Fixed ndiswrapper script to show correct device IDs. Version 1.30 2006-11-28 -======================= +======================= * Yet another fix to ndiswrapper script (to handle file names with upper case extensions). Version 1.29 2006-11-23 -======================= +======================= * Fixed ndiswrapper script to handle INF files properly. * Added support for Atheros 5416 (802.11n) chipset. Version 1.28 2006-10-29 -======================= +======================= * Windows drivers may request firmware to be loaded in either upper or lower case (either full name or partially). Instead of using given name, use installed name. This fixes firmware loading issue with Airgo networks @@ -200,25 +209,25 @@ 'make USE_OWN_WQ=1'. Final 2.6.19 may not need this (hopefully). Version 1.27 2006-10-21 -======================= +======================= * Bug fix to drivers that load binary firmware files (broken in 1.26). This fixes issues with Atheros and TI drivers. * Atheros PCI driver requests more map registers for DMA than limit specified in NDIS. Instead of failing such invalid requests, continue. Version 1.26 2006-10-14 -======================= +======================= * Removed debug flag in ndiswrapper script * When HIGHMEM is enabled, allocate and copy URB buffers only if necessary. This prevents memory allocation failures. Version 1.25 2006-10-04 -======================= +======================= * Support for WE-21 * Bug fixes Version 1.24 2006-10-01 -======================= +======================= * Compilation issues with 2.4 fixed (yet again!) * Devices are recognized when they are inserted, instead of registering when module is loaded. With this, new Windows drivers can be installed / updated @@ -229,20 +238,20 @@ * 64-bit RT2500 USB driver works Version 1.23 2006-08-10 -======================= +======================= * Bug fixes to recent changes in 64-bit driver support. * ZyDas ZD1211 driver uses interrupt-out URBs, so set them up properly. * Bug fixes to Atheros USB driver support. Version 1.22 2006-08-05 -======================= +======================= * Added support for Broadcom 802.11n (draft) driver * Added support for 64-bit Marvell driver * Optimizations for 64-bit drivers * If network interface name changes (through udev, ifrename etc), ndiswrapper notices it and changes entry in procfs * Compilation issue with 2.4 issue fixed - + Version 1.21 2006-07-15 ======================= * Fix to a bug (in 1.20) that locked up when used with RT2500 with SMP. @@ -644,7 +653,7 @@ * Byte statistics for ifconfig. * Kernel 2.4 support. * Support for more Broadcom cards (No centrino yet). -* Tons of bugfixes should improve stability a lot. +* Tons of bugfixes should improve stability a lot. Version 0.1 2003-11-17 ====================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/INSTALL new/ndiswrapper-1.55/INSTALL --- old/ndiswrapper-1.53/INSTALL 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/INSTALL 2009-06-29 04:09:27.000000000 +0200 @@ -4,7 +4,7 @@ http://ndiswrapper.sourceforge.net/wiki -Prerequisites +Prerequisites ============= You need a recent kernel, at least 2.6.16, with header files for the @@ -15,7 +15,7 @@ should have at least 'include' directory and '.config' file. -Downloading +Downloading =========== Download the latest version of the ndiswrapper sources from here and @@ -32,7 +32,7 @@ Login as root and run make install -Install Windows driver +Install Windows driver ====================== If this is the first time you install ndiswrapper, you need to install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/Makefile new/ndiswrapper-1.55/Makefile --- old/ndiswrapper-1.53/Makefile 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/Makefile 2009-06-29 04:09:27.000000000 +0200 @@ -9,14 +9,14 @@ ndiswrapper.8 loadndisdriver.8 DIST_SUBDIRS=utils driver -DESTDIR = +DESTDIR = mandir = $(DESTDIR)$(shell [ -d /usr/man/man8 ] && echo /usr/man || echo /usr/share/man ) KVERS ?= $(shell uname -r) .PHONY: all -all: +all: +make -C driver +make -C utils diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/README new/ndiswrapper-1.55/README --- old/ndiswrapper-1.53/README 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/README 2009-06-29 04:09:27.000000000 +0200 @@ -17,7 +17,7 @@ ============ See INSTALL for a short version of installation instructions. More -up-to-date instructions, as well as FAQ etc., can be found at +up-to-date instructions, as well as FAQ etc., can be found at http://ndiswrapper.sourceforge.net/wiki/index.php?Installation. Problems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/Makefile new/ndiswrapper-1.55/driver/Makefile --- old/ndiswrapper-1.53/driver/Makefile 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/Makefile 2009-06-29 04:09:27.000000000 +0200 @@ -52,7 +52,7 @@ endif include $(KBUILD)/.config -# returns of structs and unions in registers when possible, like Windows +# returns of structs and unions in registers when possible, like Windows EXTRA_CFLAGS += -freg-struct-return # to produce debug trace, add option "DEBUG=<n>" where <n> is 1 to 6 @@ -136,19 +136,21 @@ quiet_cmd_mkexport = MKEXPORT $@ cmd_mkexport = $(SHELL) $(obj)/mkexport.sh $< $@ +extra-y += $(EXPORTS) %_exports.h: %.c $(obj)/mkexport.sh FORCE $(call if_changed,mkexport) -extra-y := $(EXPORTS) +$(addprefix $(obj)/,$(EXPORTS:_exports.h=.o)): %.o: %_exports.h ifeq ($(CONFIG_X86_64),y) quiet_cmd_mkstubs = MKSTUBS $@ cmd_mkstubs = $(SHELL) $(obj)/mkstubs.sh $(addprefix $(src)/,$(STUB_SRCS)) >$@ +extra-y += win2lin_stubs.h $(obj)/win2lin_stubs.h: $(addprefix $(src)/,$(STUB_SRCS)) FORCE $(call if_changed,mkstubs) -extra-y += win2lin_stubs.h +$(obj)/win2lin_stubs.o: $(obj)/win2lin_stubs.h OBJS += win2lin_stubs.o else OBJS += divdi3.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/crt.c new/ndiswrapper-1.55/driver/crt.c --- old/ndiswrapper-1.53/driver/crt.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/crt.c 2009-06-29 04:09:27.000000000 +0200 @@ -482,61 +482,61 @@ wstdcall s64 WIN_FUNC(_alldiv,2) (s64 a, s64 b) { - return (a / b); + return a / b; } wstdcall u64 WIN_FUNC(_aulldiv,2) (u64 a, u64 b) { - return (a / b); + return a / b; } wstdcall s64 WIN_FUNC(_allmul,2) (s64 a, s64 b) { - return (a * b); + return a * b; } wstdcall u64 WIN_FUNC(_aullmul,2) (u64 a, u64 b) { - return (a * b); + return a * b; } wstdcall s64 WIN_FUNC(_allrem,2) (s64 a, s64 b) { - return (a % b); + return a % b; } wstdcall u64 WIN_FUNC(_aullrem,2) (u64 a, u64 b) { - return (a % b); + return a % b; } __attribute__((regparm(3))) s64 WIN_FUNC(_allshl,2) (s64 a, u8 b) { - return (a << b); + return a << b; } __attribute__((regparm(3))) u64 WIN_FUNC(_aullshl,2) (u64 a, u8 b) { - return (a << b); + return a << b; } __attribute__((regparm(3))) s64 WIN_FUNC(_allshr,2) (s64 a, u8 b) { - return (a >> b); + return a >> b; } __attribute__((regparm(3))) u64 WIN_FUNC(_aullshr,2) (u64 a, u8 b) { - return (a >> b); + return a >> b; } int stricmp(const char *s1, const char *s2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/iw_ndis.c new/ndiswrapper-1.55/driver/iw_ndis.c --- old/ndiswrapper-1.53/driver/iw_ndis.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/iw_ndis.c 2009-06-29 04:09:27.000000000 +0200 @@ -47,12 +47,6 @@ req.length = ssid_len; if (ssid_len) memcpy(&req.essid, ssid, ssid_len); - DBG_BLOCK(2) { - char buf[NDIS_ESSID_MAX_SIZE+1]; - memcpy(buf, ssid, ssid_len); - buf[ssid_len] = 0; - TRACE2("ssid = '%s'", buf); - } res = mp_set(wnd, OID_802_11_SSID, &req, sizeof(req)); if (res) { @@ -125,7 +119,6 @@ EXIT2(return -EOPNOTSUPP); } memcpy(extra, req.essid, req.length); - extra[req.length] = 0; if (req.length > 0) wrqu->essid.flags = 1; else @@ -998,10 +991,10 @@ { struct ndis_device *wnd = netdev_priv(dev); - if (wrqu->data.length > IW_ESSID_MAX_SIZE || wrqu->data.length <= 0) + if (wrqu->data.length >= IW_ESSID_MAX_SIZE || wrqu->data.length <= 0) return -EINVAL; - memset(wnd->nick, 0, sizeof(wnd->nick)); memcpy(wnd->nick, extra, wrqu->data.length); + wnd->nick[wrqu->data.length] = 0; return 0; } @@ -1015,7 +1008,16 @@ return 0; } -static char *ndis_translate_scan(struct net_device *dev, char *event, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT) +#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e) +#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e) +#define iwe_stream_add_value(a, b, c, d, e, f) \ + iwe_stream_add_value(b, c, d, e, f) +#define iwe_stream_lcp_len(a) IW_EV_LCP_LEN +#endif + +static char *ndis_translate_scan(struct net_device *dev, + struct iw_request_info *info, char *event, char *end_buf, void *item) { struct iw_event iwe; @@ -1034,7 +1036,8 @@ iwe.u.ap_addr.sa_family = ARPHRD_ETHER; iwe.len = IW_EV_ADDR_LEN; memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN); - event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_ADDR_LEN); + event = iwe_stream_add_event(info, event, end_buf, &iwe, + IW_EV_ADDR_LEN); /* add essid */ memset(&iwe, 0, sizeof(iwe)); @@ -1044,13 +1047,15 @@ iwe.u.data.length = IW_ESSID_MAX_SIZE; iwe.u.data.flags = 1; iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; - event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid); + event = iwe_stream_add_point(info, event, end_buf, &iwe, + bssid->ssid.essid); /* add protocol name */ memset(&iwe, 0, sizeof(iwe)); iwe.cmd = SIOCGIWNAME; strncpy(iwe.u.name, network_type_to_name(bssid->net_type), IFNAMSIZ); - event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_CHAR_LEN); + event = iwe_stream_add_event(info, event, end_buf, &iwe, + IW_EV_CHAR_LEN); /* add mode */ memset(&iwe, 0, sizeof(iwe)); @@ -1061,7 +1066,8 @@ iwe.u.mode = IW_MODE_INFRA; else // if (bssid->mode == Ndis802_11AutoUnknown) iwe.u.mode = IW_MODE_AUTO; - event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_UINT_LEN); + event = iwe_stream_add_event(info, event, end_buf, &iwe, + IW_EV_UINT_LEN); /* add freq */ memset(&iwe, 0, sizeof(iwe)); @@ -1076,7 +1082,8 @@ /* convert from kHz to Hz */ iwe.u.freq.e += 3; iwe.len = IW_EV_FREQ_LEN; - event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_FREQ_LEN); + event = iwe_stream_add_event(info, event, end_buf, &iwe, + IW_EV_FREQ_LEN); /* add qual */ memset(&iwe, 0, sizeof(iwe)); @@ -1090,7 +1097,8 @@ iwe.u.qual.noise = WL_NOISE; iwe.u.qual.qual = i; iwe.len = IW_EV_QUAL_LEN; - event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_QUAL_LEN); + event = iwe_stream_add_event(info, event, end_buf, &iwe, + IW_EV_QUAL_LEN); /* add key info */ memset(&iwe, 0, sizeof(iwe)); @@ -1101,11 +1109,12 @@ iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; iwe.u.data.length = 0; iwe.len = IW_EV_POINT_LEN; - event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid); + event = iwe_stream_add_point(info, event, end_buf, &iwe, + bssid->ssid.essid); /* add rate */ memset(&iwe, 0, sizeof(iwe)); - current_val = event + IW_EV_LCP_LEN; + current_val = event + iwe_stream_lcp_len(info); iwe.cmd = SIOCGIWRATE; if (bssid->length > sizeof(*bssid)) nrates = NDIS_MAX_RATES_EX; @@ -1115,26 +1124,27 @@ if (bssid->rates[i] & 0x7f) { iwe.u.bitrate.value = ((bssid->rates[i] & 0x7f) * 500000); - current_val = iwe_stream_add_value(event, current_val, + current_val = iwe_stream_add_value(info, event, + current_val, end_buf, &iwe, IW_EV_PARAM_LEN); } } - if ((current_val - event) > IW_EV_LCP_LEN) + if ((current_val - event) > iwe_stream_lcp_len(info)) event = current_val; memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; sprintf(buf, "bcn_int=%d", bssid->config.beacon_period); iwe.u.data.length = strlen(buf); - event = iwe_stream_add_point(event, end_buf, &iwe, buf); + event = iwe_stream_add_point(info, event, end_buf, &iwe, buf); memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; sprintf(buf, "atim=%u", bssid->config.atim_window); iwe.u.data.length = strlen(buf); - event = iwe_stream_add_point(event, end_buf, &iwe, buf); + event = iwe_stream_add_point(info, event, end_buf, &iwe, buf); TRACE2("%d, %u", bssid->length, (unsigned int)sizeof(*bssid)); if (bssid->length > sizeof(*bssid)) { @@ -1155,8 +1165,9 @@ memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVGENIE; iwe.u.data.length = ielen; - event = iwe_stream_add_point(event, end_buf, - &iwe, iep); + event = iwe_stream_add_point(info, event, + end_buf, &iwe, + iep); } iep += ielen; } @@ -1236,7 +1247,7 @@ TRACE2("%d", bssid_list->num_items); cur_item = &bssid_list->bssid[0]; for (i = 0; i < bssid_list->num_items; i++) { - event = ndis_translate_scan(dev, event, + event = ndis_translate_scan(dev, info, event, extra + IW_SCAN_MAX_DATA, cur_item); cur_item = (struct ndis_wlan_bssid *)((char *)cur_item + cur_item->length); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/ndis.c new/ndiswrapper-1.55/driver/ndis.c --- old/ndiswrapper-1.53/driver/ndis.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/ndis.c 2009-06-29 04:09:27.000000000 +0200 @@ -945,19 +945,19 @@ EXIT2(return NDIS_STATUS_RESOURCES); } if (dmasize == NDIS_DMA_24BITS) { - if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_24BIT_MASK) || + if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(24)) || pci_set_consistent_dma_mask(wnd->wd->pci.pdev, - DMA_24BIT_MASK)) + DMA_BIT_MASK(24))) WARNING("setting dma mask failed"); } else if (dmasize == NDIS_DMA_32BITS) { /* consistent dma is in low 32-bits by default */ - if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_32BIT_MASK)) + if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(32))) WARNING("setting dma mask failed"); #ifdef CONFIG_X86_64 } else if (dmasize == NDIS_DMA_64BITS) { - if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_64BIT_MASK) || + if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(64)) || pci_set_consistent_dma_mask(wnd->wd->pci.pdev, - DMA_64BIT_MASK)) + DMA_BIT_MASK(64))) WARNING("setting dma mask failed"); else wnd->net_dev->features |= NETIF_F_HIGHDMA; @@ -1033,10 +1033,10 @@ TRACE3("%p, %p, %u", buf, MmGetSystemAddressForMdl(buf), MmGetMdlByteCount(buf)); DBG_BLOCK(4) { - dump_bytes(__FUNCTION__, MmGetSystemAddressForMdl(buf), + dump_bytes(__func__, MmGetSystemAddressForMdl(buf), MmGetMdlByteCount(buf)); } - wnd->dma_map_addr[index] = + wnd->dma_map_addr[index] = PCI_DMA_MAP_SINGLE(wnd->wd->pci.pdev, MmGetSystemAddressForMdl(buf), MmGetMdlByteCount(buf), PCI_DMA_TODEVICE); @@ -1893,7 +1893,7 @@ { struct ndis_mp_interrupt *mp_interrupt = ctx; struct ndis_device *wnd = mp_interrupt->nmb->wnd; - BOOLEAN recognized, queue_handler; + BOOLEAN recognized = TRUE, queue_handler = TRUE; TRACE6("%p", wnd); /* kernel may call ISR when registering interrupt, in @@ -2014,24 +2014,10 @@ ENTER2("status=0x%x len=%d", status, len); switch (status) { case NDIS_STATUS_MEDIA_CONNECT: - netif_carrier_on(wnd->net_dev); - wnd->tx_ok = 1; - if (netif_queue_stopped(wnd->net_dev)) - netif_wake_queue(wnd->net_dev); - if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { - set_bit(LINK_STATUS_ON, &wnd->ndis_pending_work); - schedule_wrapndis_work(&wnd->ndis_work); - } + set_media_state(wnd, NdisMediaStateConnected); break; case NDIS_STATUS_MEDIA_DISCONNECT: - netif_carrier_off(wnd->net_dev); - netif_stop_queue(wnd->net_dev); - wnd->tx_ok = 0; - if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { - memset(&wnd->essid, 0, sizeof(wnd->essid)); - set_bit(LINK_STATUS_OFF, &wnd->ndis_pending_work); - schedule_wrapndis_work(&wnd->ndis_work); - } + set_media_state(wnd, NdisMediaStateDisconnected); break; case NDIS_STATUS_MEDIA_SPECIFIC_INDICATION: if (!buf) @@ -2614,9 +2600,9 @@ #ifdef CONFIG_X86_64 if (dma_size != NDIS_DMA_64BITS) { TRACE1("DMA size is not 64-bits"); - if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_32BIT_MASK) || + if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(32)) || pci_set_consistent_dma_mask(wnd->wd->pci.pdev, - DMA_32BIT_MASK)) + DMA_BIT_MASK(32))) WARNING("setting dma mask failed"); } #endif @@ -2638,7 +2624,7 @@ wstdcall CHAR WIN_FUNC(NdisSystemProcessorCount,0) (void) { - return NR_CPUS; + return (CHAR)NR_CPUS; } wstdcall void WIN_FUNC(NdisGetCurrentProcessorCounts,3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/ndis.h new/ndiswrapper-1.55/driver/ndis.h --- old/ndiswrapper-1.53/driver/ndis.h 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/ndis.h 2009-06-29 04:09:27.000000000 +0200 @@ -606,6 +606,11 @@ enum ndis_radio_status radio_state; }; +enum ndis_media_state { + NdisMediaStateConnected, + NdisMediaStateDisconnected, +}; + enum ndis_media_stream_mode { Ndis802_11MediaStreamOff, Ndis802_11MediaStreamOn }; @@ -877,7 +882,7 @@ struct timer_list iw_stats_timer; unsigned long scan_timestamp; struct encr_info encr_info; - char nick[IW_ESSID_MAX_SIZE]; + char nick[IW_ESSID_MAX_SIZE + 1]; struct ndis_essid essid; struct auth_encr_capa capa; enum ndis_infrastructure_mode infrastructure_mode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/ndiswrapper.h new/ndiswrapper-1.55/driver/ndiswrapper.h --- old/ndiswrapper-1.53/driver/ndiswrapper.h 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/ndiswrapper.h 2009-06-29 04:09:27.000000000 +0200 @@ -16,7 +16,7 @@ #ifndef _NDISWRAPPER_H_ #define _NDISWRAPPER_H_ -#define DRIVER_VERSION "1.53" +#define DRIVER_VERSION "1.55" #define UTILS_VERSION "1.9" #define DRIVER_NAME "ndiswrapper" @@ -76,7 +76,7 @@ #define MSG(level, fmt, ...) \ printk(level "ndiswrapper (%s:%d): " fmt "\n", \ - __FUNCTION__, __LINE__ , ## __VA_ARGS__) + __func__, __LINE__ , ## __VA_ARGS__) #define WARNING(fmt, ...) MSG(KERN_WARNING, fmt, ## __VA_ARGS__) #define ERROR(fmt, ...) MSG(KERN_ERR, fmt , ## __VA_ARGS__) @@ -102,7 +102,7 @@ do { \ if (debug >= level) \ printk(KERN_INFO "%s (%s:%d): " fmt "\n", DRIVER_NAME, \ - __FUNCTION__, __LINE__ , ## __VA_ARGS__); \ + __func__, __LINE__ , ## __VA_ARGS__); \ } while (0) #undef DBG_BLOCK #define DBG_BLOCK(level) if (debug >= level) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/ntoskernel.c new/ndiswrapper-1.55/driver/ntoskernel.c --- old/ndiswrapper-1.53/driver/ntoskernel.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/ntoskernel.c 2009-06-29 04:09:27.000000000 +0200 @@ -419,12 +419,12 @@ BUG_ON(wrap_timer->wrap_timer_magic != WRAP_TIMER_MAGIC); BUG_ON(nt_timer->wrap_timer_magic != WRAP_TIMER_MAGIC); #endif - kdpc = nt_timer->kdpc; - if (kdpc) - queue_kdpc(kdpc); KeSetEvent((struct nt_event *)nt_timer, 0, FALSE); if (wrap_timer->repeat) mod_timer(&wrap_timer->timer, jiffies + wrap_timer->repeat); + kdpc = nt_timer->kdpc; + if (kdpc) + queue_kdpc(kdpc); TIMEREXIT(return); } @@ -561,11 +561,10 @@ #ifdef TIMER_DEBUG BUG_ON(wrap_timer->wrap_timer_magic != WRAP_TIMER_MAGIC); #endif - TIMERTRACE("canceling timer %p(%p)", wrap_timer, nt_timer); /* disable timer before deleting so if it is periodic timer, it * won't be re-armed after deleting */ wrap_timer->repeat = 0; - ret = del_timer(&wrap_timer->timer); + ret = del_timer_sync(&wrap_timer->timer); /* the documentation for KeCancelTimer suggests the DPC is * deqeued, but actually DPC is left to run */ if (ret) @@ -1698,14 +1697,14 @@ #ifdef CONFIG_X86_64 /* GFP_DMA is really only 16MB even on x86-64, but there is no * other zone available */ - if (highest <= DMA_31BIT_MASK) + if (highest <= DMA_BIT_MASK(31)) flags |= __GFP_DMA; - else if (highest <= DMA_32BIT_MASK) + else if (highest <= DMA_BIT_MASK(32)) flags |= __GFP_DMA32; #else - if (highest <= DMA_24BIT_MASK) + if (highest <= DMA_BIT_MASK(24)) flags |= __GFP_DMA; - else if (highest > DMA_30BIT_MASK) + else if (highest > DMA_BIT_MASK(30)) flags |= __GFP_HIGHMEM; #endif addr = wrap_get_free_pages(flags, size); @@ -1760,8 +1759,8 @@ wstdcall ULONG WIN_FUNC(MmSizeOfMdl,2) (void *base, ULONG length) { - return (sizeof(struct mdl) + - (sizeof(PFN_NUMBER) * SPAN_PAGES(base, length))); + return sizeof(struct mdl) + + (sizeof(PFN_NUMBER) * SPAN_PAGES(base, length)); } struct mdl *allocate_init_mdl(void *virt, ULONG length) @@ -2389,12 +2388,19 @@ va_start(args, format); vsnprintf(buf, sizeof(buf), format, args); - printk(KERN_DEBUG "%s (%s): %s", DRIVER_NAME, __FUNCTION__, buf); + printk(KERN_DEBUG "%s (%s): %s", DRIVER_NAME, __func__, buf); va_end(args); #endif return STATUS_SUCCESS; } +wstdcall void WIN_FUNC(KeBugCheck,1) + (ULONG code) +{ + TODO(); + return; +} + wstdcall void WIN_FUNC(KeBugCheckEx,5) (ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_PTR param3, ULONG_PTR param4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/ntoskernel.h new/ndiswrapper-1.55/driver/ntoskernel.h --- old/ndiswrapper-1.53/driver/ntoskernel.h 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/ntoskernel.h 2009-06-29 04:09:27.000000000 +0200 @@ -53,11 +53,13 @@ /* Interrupt backwards compatibility stuff */ #include <linux/interrupt.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) #ifndef IRQ_HANDLED #define IRQ_HANDLED #define IRQ_NONE #define irqreturn_t void #endif +#endif /* Linux < 2.6.29 */ /* pci functions in 2.6 kernels have problems allocating dma buffers, * but seem to work fine with dma functions @@ -304,20 +306,10 @@ #define memcpy_skb(skb, from, length) \ memcpy(skb_put(skb, length), from, length) -#ifndef DMA_24BIT_MASK -#define DMA_24BIT_MASK 0x0000000000ffffffULL +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +#ifndef DMA_BIT_MASK +#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) #endif - -#ifndef DMA_30BIT_MASK -#define DMA_30BIT_MASK 0x000000003fffffffULL -#endif - -#ifndef DMA_31BIT_MASK -#define DMA_31BIT_MASK 0x000000007fffffffULL -#endif - -#ifndef DMA_32BIT_MASK -#define DMA_32BIT_MASK 0x00000000ffffffffULL #endif #ifndef __GFP_DMA32 @@ -692,7 +684,7 @@ } static inline void lower_irql(KIRQL oldirql) -{ +{ irql_info_t *info; assert(oldirql <= DISPATCH_LEVEL); @@ -883,6 +875,7 @@ #define u64_low_32(x) ((u32)x) #define u64_high_32(x) ((u32)(x >> 32)) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) static inline u64 cmpxchg8b(volatile u64 *ptr, u64 old, u64 new) { u64 prev; @@ -894,6 +887,7 @@ : "A" (old), "b" (u64_low_32(new)), "c" (u64_high_32(new))); return prev; } +#endif /* slist routines below update slist atomically - no need for * spinlocks */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/pe_linker.c new/ndiswrapper-1.55/driver/pe_linker.c --- old/ndiswrapper-1.53/driver/pe_linker.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/pe_linker.c 2009-06-29 04:09:27.000000000 +0200 @@ -44,7 +44,7 @@ #if defined(DEBUGLINKER) && DEBUGLINKER > 0 #define DBGLINKER(fmt, ...) printk(KERN_INFO "%s (%s:%d): " fmt "\n", \ - DRIVER_NAME, __FUNCTION__, \ + DRIVER_NAME, __func__, \ __LINE__ , ## __VA_ARGS__); static const char *image_directory_name[] = { "EXPORT", @@ -207,10 +207,10 @@ opt_hdr->DataDirectory[i].Size); } - if ((nt_hdr->FileHeader.Characteristics & IMAGE_FILE_DLL)) - return IMAGE_FILE_DLL; if ((nt_hdr->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) return IMAGE_FILE_EXECUTABLE_IMAGE; + if ((nt_hdr->FileHeader.Characteristics & IMAGE_FILE_DLL)) + return IMAGE_FILE_DLL; return -EINVAL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/pnp.c new/ndiswrapper-1.55/driver/pnp.c --- old/ndiswrapper-1.53/driver/pnp.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/pnp.c 2009-06-29 04:09:27.000000000 +0200 @@ -63,8 +63,8 @@ /* 64-bit broadcom driver doesn't work if DMA is allocated * from over 1GB */ if (wd->vendor == 0x14e4) { - if (pci_set_dma_mask(pdev, DMA_30BIT_MASK) || - pci_set_consistent_dma_mask(pdev, DMA_30BIT_MASK)) + if (pci_set_dma_mask(pdev, DMA_BIT_MASK(30)) || + pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(30))) WARNING("couldn't set DMA mask; this driver " "may not work with more than 1GB RAM"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/proc.c new/ndiswrapper-1.55/driver/proc.c --- old/ndiswrapper-1.53/driver/proc.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/proc.c 2009-06-29 04:09:27.000000000 +0200 @@ -69,7 +69,7 @@ *eof = 1; } - return (p - page); + return p - page; } static int procfs_read_ndis_encr(char *page, char **start, off_t off, @@ -97,10 +97,9 @@ p += sprintf(p, "\n"); res = mp_query(wnd, OID_802_11_SSID, &essid, sizeof(essid)); - if (!res) { - essid.essid[essid.length] = '\0'; - p += sprintf(p, "essid=%s\n", essid.essid); - } + if (!res) + p += sprintf(p, "essid=%.*s\n", essid.length, essid.essid); + res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &encr_status); if (!res) { typeof(&wnd->encr_info.keys[0]) tx_key; @@ -128,7 +127,7 @@ *eof = 1; } - return (p - page); + return p - page; } static int procfs_read_ndis_hw(char *page, char **start, off_t off, @@ -249,7 +248,7 @@ *eof = 1; } - return (p - page); + return p - page; } static int procfs_read_ndis_settings(char *page, char **start, off_t off, @@ -276,7 +275,7 @@ p += sprintf(p, "%s=%s\n", setting->name, setting->value); } - return (p - page); + return p - page; } static int procfs_write_ndis_settings(struct file *file, const char __user *buf, @@ -501,7 +500,7 @@ p += sprintf(p, "total size of allocations in %d: %d\n", type, alloc_size(type)); #endif - return (p - page); + return p - page; } static int procfs_write_debug(struct file *file, const char __user *buf, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/rtl.c new/ndiswrapper-1.55/driver/rtl.c --- old/ndiswrapper-1.53/driver/rtl.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/rtl.c 2009-06-29 04:09:27.000000000 +0200 @@ -202,7 +202,7 @@ for (i = 0; i < string->max_length && string->buf[i]; i++) ; - return (i * sizeof(wchar_t)); + return i * sizeof(wchar_t); } wstdcall ULONG WIN_FUNC(RtlxUnicodeStringToAnsiSize,1) @@ -451,9 +451,9 @@ if (alloc) { dst->buf = ExAllocatePoolWithTag(NonPagedPool, src->length, 0); - if (dst->buf) { + if (dst->buf) dst->max_length = src->length; - } else + else EXIT2(return STATUS_NO_MEMORY); } else { if (dst->max_length < src->length) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/wrapmem.c new/ndiswrapper-1.55/driver/wrapmem.c --- old/ndiswrapper-1.53/driver/wrapmem.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/wrapmem.c 2009-06-29 04:09:27.000000000 +0200 @@ -129,7 +129,7 @@ spin_unlock_bh(&alloc_lock); #endif TRACE4("%p", info + 1); - return (info + 1); + return info + 1; } void *wrap_kzalloc(size_t size, gfp_t flags, const char *file, int line) @@ -178,7 +178,7 @@ InsertTailList(&allocs, &info->list); spin_unlock_bh(&alloc_lock); #endif - return (info + 1); + return info + 1; } void *wrap__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot, @@ -203,7 +203,7 @@ InsertTailList(&allocs, &info->list); spin_unlock_bh(&alloc_lock); #endif - return (info + 1); + return info + 1; } void wrap_vfree(void *ptr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/wrapndis.c new/ndiswrapper-1.55/driver/wrapndis.c --- old/ndiswrapper-1.53/driver/wrapndis.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/wrapndis.c 2009-06-29 04:09:27.000000000 +0200 @@ -547,7 +547,7 @@ (void *)(ULONG_PTR)csum.value; } DBG_BLOCK(4) { - dump_bytes(__FUNCTION__, skb->data, skb->len); + dump_bytes(__func__, skb->data, skb->len); } TRACE4("%p, %p, %p", packet, buffer, skb); return packet; @@ -801,6 +801,32 @@ EXIT3(return -1); } +void set_media_state(struct ndis_device *wnd, enum ndis_media_state state) +{ + ENTER2("state: 0x%x", state); + if (state == NdisMediaStateConnected) { + netif_carrier_on(wnd->net_dev); + wnd->tx_ok = 1; + if (netif_queue_stopped(wnd->net_dev)) + netif_wake_queue(wnd->net_dev); + if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { + set_bit(LINK_STATUS_ON, &wnd->ndis_pending_work); + schedule_wrapndis_work(&wnd->ndis_work); + } + } else if (state == NdisMediaStateDisconnected) { + netif_carrier_off(wnd->net_dev); + netif_stop_queue(wnd->net_dev); + wnd->tx_ok = 0; + if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { + memset(&wnd->essid, 0, sizeof(wnd->essid)); + set_bit(LINK_STATUS_OFF, &wnd->ndis_pending_work); + schedule_wrapndis_work(&wnd->ndis_work); + } + } else { + WARNING("invalid media state: 0x%x", state); + } +} + static int ndis_net_dev_open(struct net_device *net_dev) { ENTER1("%p", netdev_priv(net_dev)); @@ -995,7 +1021,7 @@ TRACE2("query assoc_info failed (%08X)", res); kfree(ndis_assoc_info); goto send_assoc_event; - } + } TRACE2("%u, 0x%x, %u, 0x%x, %u", ndis_assoc_info->length, ndis_assoc_info->req_ies, ndis_assoc_info->req_ie_length, ndis_assoc_info->resp_ies, ndis_assoc_info->resp_ie_length); @@ -1626,7 +1652,7 @@ return 1; else return 0; -} +} static int ndis_set_tx_csum(struct net_device *dev, u32 data) { @@ -1635,9 +1661,9 @@ if (data && (wnd->tx_csum.value == 0)) return -EOPNOTSUPP; - if (wnd->tx_csum.ip_csum) { + if (wnd->tx_csum.ip_csum) ethtool_op_set_tx_hw_csum(dev, data); - } else + else ethtool_op_set_tx_csum(dev, data); return 0; } @@ -1660,7 +1686,7 @@ return ethtool_op_get_sg(dev); else return 0; -} +} static int ndis_set_sg(struct net_device *dev, u32 data) { @@ -1669,7 +1695,7 @@ return ethtool_op_set_sg(dev, data); else return -EOPNOTSUPP; -} +} static struct ethtool_ops ndis_ethtool_ops = { .get_drvinfo = ndis_get_drvinfo, @@ -1690,7 +1716,8 @@ struct net_device *net_dev = ptr; ENTER2("0x%lx", event); - if (net_dev->open == ndis_net_dev_open && event == NETDEV_CHANGENAME) { + if (net_dev->ethtool_ops == &ndis_ethtool_ops + && event == NETDEV_CHANGENAME) { struct ndis_device *wnd = netdev_priv(net_dev); /* called with rtnl lock held, so no need to lock */ wrap_procfs_remove_ndis_device(wnd); @@ -1707,6 +1734,21 @@ .notifier_call = notifier_event, }; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +static const struct net_device_ops ndis_netdev_ops = { + .ndo_open = ndis_net_dev_open, + .ndo_stop = ndis_net_dev_close, + .ndo_start_xmit = tx_skbuff, + .ndo_change_mtu = ndis_change_mtu, + .ndo_set_multicast_list = ndis_set_multicast_list, + .ndo_set_mac_address = ndis_set_mac_address, + .ndo_get_stats = ndis_get_stats, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = ndis_poll_controller, +#endif +}; +#endif + static NDIS_STATUS ndis_start_device(struct ndis_device *wnd) { struct wrap_device *wd; @@ -1746,17 +1788,23 @@ wnd->packet_filter = NDIS_PACKET_TYPE_DIRECTED | NDIS_PACKET_TYPE_BROADCAST | NDIS_PACKET_TYPE_MULTICAST; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + net_dev->netdev_ops = &ndis_netdev_ops; +#else net_dev->open = ndis_net_dev_open; net_dev->hard_start_xmit = tx_skbuff; net_dev->stop = ndis_net_dev_close; net_dev->get_stats = ndis_get_stats; net_dev->change_mtu = ndis_change_mtu; - net_dev->do_ioctl = NULL; + net_dev->set_multicast_list = ndis_set_multicast_list; + net_dev->set_mac_address = ndis_set_mac_address; +#ifdef CONFIG_NET_POLL_CONTROLLER + net_dev->poll_controller = ndis_poll_controller; +#endif +#endif if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { net_dev->wireless_handlers = &ndis_handler_def; } - net_dev->set_multicast_list = ndis_set_multicast_list; - net_dev->set_mac_address = ndis_set_mac_address; net_dev->ethtool_ops = &ndis_ethtool_ops; if (wnd->mp_interrupt) net_dev->irq = wnd->mp_interrupt->irq; @@ -1770,9 +1818,6 @@ net_dev->flags |= IFF_MULTICAST; else net_dev->flags &= ~IFF_MULTICAST; -#ifdef CONFIG_NET_POLL_CONTROLLER - net_dev->poll_controller = ndis_poll_controller; -#endif buf = kmalloc(buf_len, GFP_KERNEL); if (!buf) { @@ -1879,6 +1924,9 @@ set_default_iw_params(wnd); } + status = mp_query_int(wnd, OID_GEN_MEDIA_CONNECT_STATUS, (int *)buf); + if (status == NDIS_STATUS_SUCCESS) + set_media_state(wnd, *((int *)buf)); kfree(buf); wrap_procfs_add_ndis_device(wnd); hangcheck_add(wnd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/driver/wrapndis.h new/ndiswrapper-1.55/driver/wrapndis.h --- old/ndiswrapper-1.53/driver/wrapndis.h 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/driver/wrapndis.h 2009-06-29 04:09:27.000000000 +0200 @@ -76,6 +76,7 @@ NDIS_STATUS status); int init_ndis_driver(struct driver_object *drv_obj); NDIS_STATUS ndis_reinit(struct ndis_device *wnd); +void set_media_state(struct ndis_device *wnd, enum ndis_media_state state); void hangcheck_add(struct ndis_device *wnd); void hangcheck_del(struct ndis_device *wnd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/ndiswrapper.8 new/ndiswrapper-1.55/ndiswrapper.8 --- old/ndiswrapper-1.53/ndiswrapper.8 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/ndiswrapper.8 2009-06-29 04:09:27.000000000 +0200 @@ -24,7 +24,7 @@ .SH DESCRIPTION \fBndiswrapper\fP is two parts: user space tool that is used to install Windows XP drivers and kernel module to load the Windows XP -drivers. Both are called +drivers. Both are called .B ndiswrapper. .br @@ -32,7 +32,7 @@ .SH ndiswrapper - tool .br .\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, .\" respectively. The user space tool (/usr/sbin/ndiswrapper) is used whenever a new Windows XP driver is to be installed. This program takes the following options: @@ -73,7 +73,7 @@ .B proc_uid=<uid> The module creates files in /proc/net/ndiswrapper that provide some useful information. These files are created so that they can be read -only by root by default. If some other user needs to access these files +only by root by default. If some other user needs to access these files without having to login as root, then replace <uid> with the user ID of that user. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/ndiswrapper.spec new/ndiswrapper-1.55/ndiswrapper.spec --- old/ndiswrapper-1.53/ndiswrapper.spec 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/ndiswrapper.spec 2009-06-29 04:09:27.000000000 +0200 @@ -1,5 +1,5 @@ # Define ndiswrapper_version only if it is not already defined. -%{!?ndiswrapper_version: %define ndiswrapper_version 1.53} +%{!?ndiswrapper_version: %define ndiswrapper_version 1.55} %{!?ndiswrapper_release: %define ndiswrapper_release 1} # Define kernel version if not already defined @@ -78,13 +78,13 @@ fi %changelog -* Mon Jan 10 2005 David Kaplan <dmk(a)localhost.localdomain> - +* Mon Jan 10 2005 David Kaplan <dmk(a)localhost.localdomain> - - Got rid of makeinstall macro as it asks for problems and use naming convention of make files. -* Tue Jan 4 2005 David Kaplan <dmk(a)localhost.localdomain> - +* Tue Jan 4 2005 David Kaplan <dmk(a)localhost.localdomain> - - Updated spec file so that it is closer to kernel module standard spec - Made ndiswrapper_version a configurable macro -* Tue Feb 3 2004 <abennett(a)olin.edu> - +* Tue Feb 3 2004 <abennett(a)olin.edu> - - Initial build. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/utils/loadndisdriver.c new/ndiswrapper-1.55/utils/loadndisdriver.c --- old/ndiswrapper-1.53/utils/loadndisdriver.c 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/utils/loadndisdriver.c 2009-06-29 04:09:27.000000000 +0200 @@ -51,7 +51,7 @@ #define LOG_MSG(where, fmt, ...) \ syslog(LOG_KERN | where, "%s: %s(%d): " fmt "\n", \ - PROG_NAME, __FUNCTION__, __LINE__ , ## __VA_ARGS__) + PROG_NAME, __func__, __LINE__ , ## __VA_ARGS__) #define ERROR(fmt, ...) LOG_MSG(LOG_INFO, fmt, ## __VA_ARGS__) #define INFO(fmt, ...) LOG_MSG(LOG_INFO, fmt, ## __VA_ARGS__) #define DBG(fmt, ...) do { \ @@ -199,7 +199,7 @@ ERROR("too many settings"); return -EINVAL; } - + } fclose(config); @@ -263,7 +263,7 @@ driver_name, strerror(errno)); return -EINVAL; } - + if ((driver = malloc(sizeof(*driver))) == NULL) { ERROR("couldn't allocate memory for driver %s", driver_name); goto err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.53/utils/ndiswrapper-buginfo new/ndiswrapper-1.55/utils/ndiswrapper-buginfo --- old/ndiswrapper-1.53/utils/ndiswrapper-buginfo 2008-05-28 04:54:08.000000000 +0200 +++ new/ndiswrapper-1.55/utils/ndiswrapper-buginfo 2009-06-29 04:09:27.000000000 +0200 @@ -84,8 +84,8 @@ read res # default to N, (nothing entered) - if [ "$res" == "" ]; then - res="N" + if [ "$res" == "" ]; then + res="N" fi case $res in @@ -137,7 +137,7 @@ log "kernel configuration:" if [ -r /proc/config.gz ]; then log_cmd 'gzip -d < /proc/config.gz' - else + else if [ -r /lib/modules/$KVERS/build/.config ]; then log_cmd "cat /lib/modules/$KVERS/build/.config" else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kpackagekit for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package kpackagekit for openSUSE:Factory checked in at Mon Aug 3 16:54:49 CEST 2009. -------- --- KDE/kpackagekit/kpackagekit.changes 2009-07-25 23:28:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/kpackagekit/kpackagekit.changes 2009-08-02 17:48:46.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 2 06:41:35 CEST 2009 - beineri(a)opensuse.org + +- updated build requires after PackageKit update + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackagekit.spec ++++++ --- /var/tmp/diff_new_pack.o538VY/_old 2009-08-03 16:47:30.000000000 +0200 +++ /var/tmp/diff_new_pack.o538VY/_new 2009-08-03 16:47:30.000000000 +0200 @@ -20,14 +20,14 @@ Name: kpackagekit Version: 0.4.1.1 -Release: 1 +Release: 2 License: GPL v3 only Group: System/Packages #http://websvn.kde.org/trunk/playground/sysadmin/kpackagekit/ Source0: http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.… Url: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libkde4-devel libpackagekit-qt11-devel +BuildRequires: libkde4-devel libpackagekit-qt12-devel Requires: PackageKit Patch: desktop.diff %kde4_runtime_requires ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gocr for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package gocr for openSUSE:Factory checked in at Mon Aug 3 16:47:18 CEST 2009. -------- --- gocr/gocr.changes 2007-10-18 13:51:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/gocr/gocr.changes 2009-08-03 11:32:59.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 3 10:45:14 CEST 2009 - meissner(a)suse.de + +- fixed as-needed build issue +- spec file cleanup + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gocr-asneeded.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gocr.spec ++++++ --- /var/tmp/diff_new_pack.TlB5Rg/_old 2009-08-03 16:44:40.000000000 +0200 +++ /var/tmp/diff_new_pack.TlB5Rg/_new 2009-08-03 16:44:40.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: ghostscript-fonts-other ghostscript-fonts-std ghostscript-x11 gtk1-compat-devel libnetpbm-devel transfig update-desktop-files Summary: GOCR--Optical Character Recognition Version: 0.41 -Release: 220 +Release: 221 Group: Productivity/Graphics/Other Requires: tcl tk License: GPL v2 or later @@ -32,6 +32,7 @@ Patch0: gocr-%{version}.dif Patch1: gocr-%{version}-pgm.patch Patch2: gocr-overflow.patch +Patch3: gocr-asneeded.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,21 +59,16 @@ %patch0 %patch1 %patch2 +%patch3 %build -CFLAGS=$RPM_OPT_FLAGS \ - ./configure --prefix=$RPM_BUILD_ROOT/usr --bindir=/bin/ --libdir=/%{_lib}/ \ - --mandir=/share/man/ --includedir=/include/ %{_target_cpu}-suse-linux-gnu +%configure make make examples make doc # gnome frontend cd frontend/gnome -CFLAGS=$RPM_OPT_FLAGS \ - ./configure --prefix=/usr --bindir=/bin/ --libdir=/lib/ \ - --mandir=/share/man/ \ - %{_target_cpu}-suse-linux-gnu \ - --disable-gtktest +%configure --disable-gtktest make %install @@ -81,7 +77,7 @@ %{INSTALL_DIR} $RPM_BUILD_ROOT fi # General source install -make install prefix=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT # install X11-Stuff. %{INSTALL_DIR} $RPM_BUILD_ROOT/usr/ %{INSTALL_DIR} $RPM_BUILD_ROOT/usr/bin ++++++ gocr-asneeded.patch ++++++ --- src/Makefile.in 2009/08/03 08:43:44 1.1 +++ src/Makefile.in 2009/08/03 08:44:06 @@ -42,7 +42,8 @@ CPPFLAGS=@CPPFLAGS@ # to see the config.h CFLAGS=@CFLAGS@ $(CPPFLAGS) -I../include $(DEFS) -LDFLAGS=@LDFLAGS@ @LIBS@ -L. +LDFLAGS=@LDFLAGS@ -L. +LIBS=@LIBS@ DESTDIR=@prefix@ .c.o: $(INCLUDEFILES) @@ -53,7 +54,7 @@ all: $(PROGRAM) $(LIBPGMASCLIB) $(PROGRAM): $(LIBPGMASCLIB) gocr.o - $(CC) -o $@ gocr.o $(LDFLAGS) ./lib$(PGMASCLIB).a + $(CC) -o $@ gocr.o $(LDFLAGS) ./lib$(PGMASCLIB).a $(LIBS) if test -r $(PROGRAM); then cp $@ ../bin; fi gocr.o: gocr.h Makefile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fuse for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package fuse for openSUSE:Factory checked in at Mon Aug 3 16:44:27 CEST 2009. -------- --- fuse/fuse.changes 2009-04-22 01:27:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2009-07-30 10:51:43.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 30 10:30:41 CEST 2009 - aj(a)suse.de + +- Fix exclude usage. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.jOM0UC/_old 2009-08-03 16:39:17.000000000 +0200 +++ /var/tmp/diff_new_pack.jOM0UC/_new 2009-08-03 16:39:17.000000000 +0200 @@ -21,8 +21,8 @@ Name: fuse Summary: User space File System Version: 2.7.4 -Release: 1 -License: GPL v2 or later; LGPL v2.1 or later +Release: 2 +License: GPL v2 or later ; LGPL v2.1 or later Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Source1: boot.fuse @@ -77,7 +77,7 @@ Miklos Szeredi <miklos(a)szeredi.hu> %package -n libfuse2 -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Library of FUSE, the User space File System for GNU/Linux and BSD Group: System/Filesystems @@ -123,7 +123,7 @@ Miklos Szeredi <miklos(a)szeredi.hu> %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Development package for FUSE (userspace filesystem) modules Group: Development/Languages/C and C++ Requires: fuse = %{version} libfuse2 = %{version} glibc-devel @@ -167,7 +167,7 @@ Miklos Szeredi <mszeredi(a)inf.bme.hu> %package devel-static -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Development package for FUSE (userspace filesystem) modules Group: Development/Languages/C and C++ Requires: fuse-devel = %{version} @@ -247,6 +247,11 @@ %{__mv} -v %{buildroot}/%{_lib}/$libname.a %{buildroot}%{_libdir} done %{__rm} -f %{buildroot}%{_libdir}/*.la +# not needed for fuse, might reappar in separate package: +%{__rm} -f %{buildroot}/%{_bindir}/ulockmgr_server +%{__rm} -f %{buildroot}/%{_libdir}/libulockmgr.* +%{__rm} -f %{buildroot}/%{_lib}/libulockmgr.so.* +%{__rm} -f %{buildroot}/%{_includedir}/ulockmgr.h %post %{insserv_force_if_yast boot.fuse} @@ -280,9 +285,6 @@ %endif %verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount /sbin/mount.fuse -# not needed for fuse, might reappar in separate package: -%exclude %{_bindir}/ulockmgr_server -%exclude /%{_lib}/libulockmgr.so.* %files -n libfuse2 %defattr(-,root,root) @@ -294,9 +296,6 @@ %{_includedir}/fuse.h %{_includedir}/fuse %{_libdir}/pkgconfig/*.pc -# not needed for fuse, might reappar in separate package: -%exclude %{_includedir}/ulockmgr.h -%exclude %{_libdir}/libulockmgr.* %files devel-static %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 eclipse for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package eclipse for openSUSE:Factory checked in at Mon Aug 3 16:39:00 CEST 2009. -------- --- eclipse/eclipse-archdep.changes 2009-06-16 11:14:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse/eclipse-archdep.changes 2009-08-03 16:12:13.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 3 14:11:43 UTC 2009 - mvyskocil(a)suse.cz + +- fix exclude list to allow splitted debuginfo packages + +------------------------------------------------------------------- --- eclipse/eclipse.changes 2009-06-16 11:14:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse/eclipse.changes 2009-08-03 16:12:15.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 3 14:11:18 UTC 2009 - mvyskocil(a)suse.cz + +- fix exclude list to allow splitted debuginfo packages + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecj-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.fzrH2i/_old 2009-08-03 16:25:35.000000000 +0200 +++ /var/tmp/diff_new_pack.fzrH2i/_new 2009-08-03 16:25:35.000000000 +0200 @@ -27,7 +27,7 @@ AutoReqProv: on Summary: Eclipse Java Compiler Version: 0.755 -Release: 172 +Release: 173 Url: http//www.eclipse.org Group: Development/Libraries/Java Source0: eclipse-sourceBuild-srcIncluded-%{eclipse_version}.tar.bz2 ++++++ eclipse-archdep.spec ++++++ --- /var/tmp/diff_new_pack.fzrH2i/_old 2009-08-03 16:25:36.000000000 +0200 +++ /var/tmp/diff_new_pack.fzrH2i/_new 2009-08-03 16:25:36.000000000 +0200 @@ -49,8 +49,8 @@ %define eclipsehome %{_datadir}/%{orig_name} Summary: Eclipse Platform and Java IDE Version: 3.4 -Release: 11 -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +Release: 12 +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Group: Development/Tools/IDE Url: http://www.eclipse.org Source0: eclipse-sourceBuild-srcIncluded-%{version}.tar.bz2 @@ -109,7 +109,7 @@ IBM %package platform -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse platform common files Group: Development/Tools/IDE Requires: ant, regexp >= 1.2 @@ -132,7 +132,7 @@ IBM %package -n libswt3-gtk2 -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: SWT Library for GTK2 Group: Development/Tools/IDE @@ -168,7 +168,7 @@ IBM %package platform -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse platform common files Group: Development/Tools/IDE Requires: ant, regexp >= 1.2 ++++++ eclipse.spec ++++++ --- /var/tmp/diff_new_pack.fzrH2i/_old 2009-08-03 16:25:36.000000000 +0200 +++ /var/tmp/diff_new_pack.fzrH2i/_new 2009-08-03 16:25:36.000000000 +0200 @@ -49,8 +49,8 @@ %define eclipsehome %{_datadir}/%{orig_name} Summary: Eclipse Platform and Java IDE Version: 3.4 -Release: 16 -License: Other uncritical OpenSource License; Eclipse Public License +Release: 17 +License: Other uncritical OpenSource License ; Eclipse Public License Group: Development/Tools/IDE Url: http://www.eclipse.org Source0: eclipse-sourceBuild-srcIncluded-%{version}.tar.bz2 @@ -109,7 +109,7 @@ IBM %package platform -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse platform common files Group: Development/Tools/IDE Requires: ant, regexp >= 1.2 @@ -132,7 +132,7 @@ IBM %package -n libswt3-gtk2 -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: SWT Library for GTK2 Group: Development/Tools/IDE @@ -168,7 +168,7 @@ IBM %package platform -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse platform common files Group: Development/Tools/IDE Requires: ant, regexp >= 1.2 @@ -194,7 +194,7 @@ IBM %package jdt -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse Java development tools Group: Development/Tools/IDE Requires: junit @@ -214,7 +214,7 @@ IBM %package source -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse Source Group: Development/Tools/IDE @@ -232,7 +232,7 @@ IBM %package pde -License: Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/ +License: PERMISSIVE-OSI-COMPLIANT ; Eclipse Public License, see http://www.eclipse.org/legal/ Summary: Eclipse Plugin Development Environment Group: Development/Tools/IDE Requires: %{orig_name} = %{version} ++++++ eclipse-archdep.files-platform ++++++ --- /var/tmp/diff_new_pack.fzrH2i/_old 2009-08-03 16:25:36.000000000 +0200 +++ /var/tmp/diff_new_pack.fzrH2i/_new 2009-08-03 16:25:36.000000000 +0200 @@ -3,9 +3,14 @@ %dir %{_datadir}/%{orig_name}/plugins %dir %{_libdir}/%{orig_name}/ %dir %{_libdir}/%{orig_name}/plugins +%dir %{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.100.v20080606/ +%dir %{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.100.v20080606/META-INF %{_libdir}/%{orig_name}/plugins/org.eclipse.core.filesystem.linux*.jar %{_libdir}/%{orig_name}/plugins/org.eclipse.update.core.linux*.jar -%{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.* +%{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.100.v20080606/about.html +%{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.100.v20080606/eclipse_1114b.so +%{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.100.v20080606/launcher.gtk.linux.*.properties +%{_libdir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.100.v20080606/META-INF/MANIFEST.MF %{_datadir}/%{orig_name}/plugins/org.eclipse.core.filesystem.linux*.jar %{_datadir}/%{orig_name}/plugins/org.eclipse.update.core.linux*.jar %{_datadir}/%{orig_name}/plugins/org.eclipse.equinox.launcher.gtk.* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 preload for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package preload for openSUSE:Factory checked in at Mon Aug 3 16:21:20 CEST 2009. -------- --- preload/preload.changes 2009-07-22 08:32:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/preload/preload.changes 2009-08-02 17:52:14.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 2 17:21:03 CEST 2009 - coolo(a)novell.com + +- kernel debuginfo is split +- leave out pae module as it's no longer used by default + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ preload.spec ++++++ --- /var/tmp/diff_new_pack.0nRIP3/_old 2009-08-03 16:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.0nRIP3/_new 2009-08-03 16:19:59.000000000 +0200 @@ -20,7 +20,7 @@ Name: preload Version: 1.0 -Release: 17 +Release: 18 Summary: Preloads Files into System Cache for Faster Booting License: GPL v2 or later Group: System/Boot @@ -34,13 +34,12 @@ BuildRequires: e2fsprogs-devel gcc-c++ update-desktop-files PreReq: %fillup_prereq %insserv_prereq # for the kmp -BuildRequires: kernel-default kernel-default-debuginfo kernel-desktop kernel-desktop-debuginfo kernel-source kernel-syms module-init-tools systemtap -%ifarch %ix86 -BuildRequires: kernel-pae kernel-pae-debuginfo -%endif +BuildRequires: kernel-source kernel-syms module-init-tools systemtap +BuildRequires: kernel-default kernel-default-base-debuginfo kernel-default-debuginfo kernel-default-devel-debuginfo kernel-default-extra-debuginfo +BuildRequires: kernel-desktop kernel-desktop-base-debuginfo kernel-desktop-debuginfo kernel-desktop-devel-debuginfo kernel-desktop-extra-debuginfo ExclusiveArch: %ix86 x86_64 Requires: preload-kmp systemtap-runtime -%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug trace xen vim +%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug trace xen vim pae %description Preload lists files to load into the system cache. This shortens system ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bundle-lang-common for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Mon Aug 3 16:19:27 CEST 2009. -------- --- bundle-lang-common/bundle-lang-common.changes 2009-07-17 12:59:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.changes 2009-08-02 20:23:40.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Aug 2 18:43:50 CEST 2009 - coolo(a)novell.com + +- add konq-plugins-lang + +------------------------------------------------------------------- +Sun Aug 2 18:41:08 CEST 2009 - coolo(a)novell.com + +- avoid gmime deps as it conflicts with gmime-2_4 + +------------------------------------------------------------------- bundle-lang-gnome-extras.changes: same change bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ --- /var/tmp/diff_new_pack.iHrGA3/_old 2009-08-03 16:19:08.000000000 +0200 +++ /var/tmp/diff_new_pack.iHrGA3/_new 2009-08-03 16:19:08.000000000 +0200 @@ -25,7 +25,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 9 +Release: 10 Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ bundle-lang-gnome-extras.spec ++++++ --- /var/tmp/diff_new_pack.iHrGA3/_old 2009-08-03 16:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iHrGA3/_new 2009-08-03 16:19:09.000000000 +0200 @@ -25,7 +25,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 8 +Release: 9 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.iHrGA3/_old 2009-08-03 16:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iHrGA3/_new 2009-08-03 16:19:09.000000000 +0200 @@ -20,12 +20,12 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-gnome -BuildRequires: at-spi-lang banshee-1-lang beagle-lang bluez-gnome-lang brasero-lang bug-buddy-lang cheese-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang evolution-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang glade-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-games-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-mount-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-pilot-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-spell2-lang gnome-system-monitor-lang gnome-terminal-lang gnome-utils-lang gnome-web-photo-lang gsynaptics-lang gtk-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang libbonoboui-lang libbtctl-lang libgda-lang libgdata-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libpurple-lang libwnck-lang liferea-lang metacity-lang monsoon-lang mousetweaks-lang nautilus-cd-burner-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang notification-daemon-lang orca-lang scrollkeeper-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang vino-lang vte-lang xchat-lang yelp-lang zenity-lang +BuildRequires: at-spi-lang banshee-1-lang bluez-gnome-lang brasero-lang bug-buddy-lang cheese-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang evolution-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang glade-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-games-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-mount-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-pilot-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-spell2-lang gnome-system-monitor-lang gnome-terminal-lang gnome-utils-lang gnome-web-photo-lang gsynaptics-lang gtk-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang libbonoboui-lang libbtctl-lang libgda-lang libgdata-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libpurple-lang libwnck-lang liferea-lang metacity-lang monsoon-lang mousetweaks-lang nautilus-cd-burner-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang notification-daemon-lang orca-lang scrollkeeper-lang system-config-printer-lang tasque-lang totem-lang totem-pl-parser-lang vino-lang vte-lang xchat-lang yelp-lang zenity-lang BuildRequires: fdupes License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 9 +Release: 10 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -47,8 +47,6 @@ Provides: locale(at-spi:en) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:en) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:en) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:en) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -203,8 +201,6 @@ Provides: locale(system-config-printer:en) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:en) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:en) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:en) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -231,8 +227,6 @@ Provides: locale(at-spi:de) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:de) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:de) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:de) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -387,8 +381,6 @@ Provides: locale(system-config-printer:de) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:de) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:de) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:de) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -415,8 +407,6 @@ Provides: locale(at-spi:es) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:es) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:es) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:es) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -571,8 +561,6 @@ Provides: locale(system-config-printer:es) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:es) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:es) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:es) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -599,8 +587,6 @@ Provides: locale(at-spi:it) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:it) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:it) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:it) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -755,8 +741,6 @@ Provides: locale(system-config-printer:it) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:it) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:it) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:it) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -783,8 +767,6 @@ Provides: locale(at-spi:fr) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:fr) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:fr) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:fr) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -939,8 +921,6 @@ Provides: locale(system-config-printer:fr) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:fr) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:fr) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:fr) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -967,8 +947,6 @@ Provides: locale(at-spi:ja) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:ja) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:ja) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:ja) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -1123,8 +1101,6 @@ Provides: locale(system-config-printer:ja) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:ja) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:ja) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:ja) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -1151,8 +1127,6 @@ Provides: locale(at-spi:zh) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:zh) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:zh) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:zh) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -1307,8 +1281,6 @@ Provides: locale(system-config-printer:zh) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:zh) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:zh) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:zh) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -1335,8 +1307,6 @@ Provides: locale(at-spi:nl) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:nl) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:nl) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:nl) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -1491,8 +1461,6 @@ Provides: locale(system-config-printer:nl) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:nl) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:nl) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:nl) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -1519,8 +1487,6 @@ Provides: locale(at-spi:cs) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:cs) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:cs) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:cs) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -1675,8 +1641,6 @@ Provides: locale(system-config-printer:cs) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:cs) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:cs) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:cs) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -1705,9 +1669,6 @@ Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:pt) Provides: locale(banshee-1:pt_BR) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:pt) -Provides: locale(beagle:pt_BR) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:pt) Provides: locale(bluez-gnome:pt_BR) @@ -1939,9 +1900,6 @@ Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:pt) Provides: locale(tasque:pt_BR) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:pt) -Provides: locale(tomboy:pt_BR) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:pt) Provides: locale(totem:pt_BR) @@ -1975,8 +1933,6 @@ Provides: locale(at-spi:pl) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:pl) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:pl) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:pl) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -2131,8 +2087,6 @@ Provides: locale(system-config-printer:pl) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:pl) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:pl) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:pl) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -2159,8 +2113,6 @@ Provides: locale(at-spi:ca) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:ca) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:ca) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:ca) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -2315,8 +2267,6 @@ Provides: locale(system-config-printer:ca) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:ca) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:ca) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:ca) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -2343,8 +2293,6 @@ Provides: locale(at-spi:ar) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:ar) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:ar) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:ar) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -2499,8 +2447,6 @@ Provides: locale(system-config-printer:ar) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:ar) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:ar) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:ar) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -2527,8 +2473,6 @@ Provides: locale(at-spi:hu) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:hu) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:hu) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:hu) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -2683,8 +2627,6 @@ Provides: locale(system-config-printer:hu) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:hu) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:hu) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:hu) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -2711,8 +2653,6 @@ Provides: locale(at-spi:ko) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:ko) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:ko) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:ko) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -2867,8 +2807,6 @@ Provides: locale(system-config-printer:ko) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:ko) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:ko) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:ko) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -2895,8 +2833,6 @@ Provides: locale(at-spi:da) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:da) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:da) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:da) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -3051,8 +2987,6 @@ Provides: locale(system-config-printer:da) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:da) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:da) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:da) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -3079,8 +3013,6 @@ Provides: locale(at-spi:sv) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:sv) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:sv) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:sv) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -3235,8 +3167,6 @@ Provides: locale(system-config-printer:sv) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:sv) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:sv) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:sv) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -3263,8 +3193,6 @@ Provides: locale(at-spi:ru) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:ru) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:ru) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:ru) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -3419,8 +3347,6 @@ Provides: locale(system-config-printer:ru) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:ru) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:ru) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:ru) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -3447,8 +3373,6 @@ Provides: locale(at-spi:fi) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:fi) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:fi) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:fi) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -3603,8 +3527,6 @@ Provides: locale(system-config-printer:fi) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:fi) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:fi) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:fi) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -3631,8 +3553,6 @@ Provides: locale(at-spi:nb) Provides: banshee-1-lang = %(rpm -q --queryformat '%{VERSION}' banshee-1-lang) Provides: locale(banshee-1:nb) -Provides: beagle-lang = %(rpm -q --queryformat '%{VERSION}' beagle-lang) -Provides: locale(beagle:nb) Provides: bluez-gnome-lang = %(rpm -q --queryformat '%{VERSION}' bluez-gnome-lang) Provides: locale(bluez-gnome:nb) Provides: brasero-lang = %(rpm -q --queryformat '%{VERSION}' brasero-lang) @@ -3787,8 +3707,6 @@ Provides: locale(system-config-printer:nb) Provides: tasque-lang = %(rpm -q --queryformat '%{VERSION}' tasque-lang) Provides: locale(tasque:nb) -Provides: tomboy-lang = %(rpm -q --queryformat '%{VERSION}' tomboy-lang) -Provides: locale(tomboy:nb) Provides: totem-lang = %(rpm -q --queryformat '%{VERSION}' totem-lang) Provides: locale(totem:nb) Provides: totem-pl-parser-lang = %(rpm -q --queryformat '%{VERSION}' totem-pl-parser-lang) @@ -3814,7 +3732,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 at-spi-lang banshee-1-lang beagle-lang bluez-gnome-lang brasero-lang bug-buddy-lang cheese-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang evolution-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang glade-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-games-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-mount-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-pilot-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-spell2-lang gnome-system-monitor-lang gnome-terminal-lang gnome-utils-lang gnome-web-photo-lang gsynaptics-lang gtk-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang libbonoboui-lang libbtctl-lang libgda-lang libgdata-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libpurple-lang libwnck-lang liferea-lang metacity-lang monsoon-lang mousetweaks-lang nautilus-cd-burner-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang notification-daemon-lang orca-lang scrollkeeper-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang vino-lang vte-lang xchat-lang yelp-lang zenity-lang +bash %SOURCE0 at-spi-lang banshee-1-lang bluez-gnome-lang brasero-lang bug-buddy-lang cheese-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang evolution-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang glade-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-games-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-mount-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-pilot-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-spell2-lang gnome-system-monitor-lang gnome-terminal-lang gnome-utils-lang gnome-web-photo-lang gsynaptics-lang gtk-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang libbonoboui-lang libbtctl-lang libgda-lang libgdata-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libpurple-lang libwnck-lang liferea-lang metacity-lang monsoon-lang mousetweaks-lang nautilus-cd-burner-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang notification-daemon-lang orca-lang scrollkeeper-lang system-config-printer-lang tasque-lang totem-lang totem-pl-parser-lang vino-lang vte-lang xchat-lang yelp-lang zenity-lang if test gnome = kde; then # pretty evil hack to keep the symlinks working langs=`cd $RPM_BUILD_ROOT/usr/share/doc-bundle/kde/HTML && ls -1d *` ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.iHrGA3/_old 2009-08-03 16:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iHrGA3/_new 2009-08-03 16:19:09.000000000 +0200 @@ -20,12 +20,12 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-kde -BuildRequires: NetworkManager-kde4-lang PolicyKit-kde-lang amarok-lang digikam-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang +BuildRequires: NetworkManager-kde4-lang PolicyKit-kde-lang amarok-lang digikam-lang kdebase4-openSUSE-lang kipi-plugins-lang konqueror-plugins-lang konversation-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang BuildRequires: fdupes License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 9 +Release: 10 Summary: Translations for a group of KDE applications BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -69,6 +69,8 @@ Provides: locale(kdebase4-openSUSE:en) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:en) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:en) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:en) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -111,6 +113,8 @@ Provides: locale(kdebase4-openSUSE:de) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:de) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:de) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:de) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -153,6 +157,8 @@ Provides: locale(kdebase4-openSUSE:es) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:es) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:es) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:es) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -195,6 +201,8 @@ Provides: locale(kdebase4-openSUSE:it) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:it) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:it) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:it) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -237,6 +245,8 @@ Provides: locale(kdebase4-openSUSE:fr) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:fr) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:fr) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:fr) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -279,6 +289,8 @@ Provides: locale(kdebase4-openSUSE:ja) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ja) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:ja) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:ja) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -321,6 +333,8 @@ Provides: locale(kdebase4-openSUSE:zh) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:zh) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:zh) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:zh) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -363,6 +377,8 @@ Provides: locale(kdebase4-openSUSE:nl) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:nl) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:nl) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:nl) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -405,6 +421,8 @@ Provides: locale(kdebase4-openSUSE:cs) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:cs) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:cs) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:cs) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -453,6 +471,9 @@ Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:pt) Provides: locale(kipi-plugins:pt_BR) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:pt) +Provides: locale(konqueror-plugins:pt_BR) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:pt) Provides: locale(konversation:pt_BR) @@ -499,6 +520,8 @@ Provides: locale(kdebase4-openSUSE:pl) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:pl) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:pl) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:pl) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -541,6 +564,8 @@ Provides: locale(kdebase4-openSUSE:ca) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ca) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:ca) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:ca) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -583,6 +608,8 @@ Provides: locale(kdebase4-openSUSE:ar) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ar) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:ar) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:ar) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -625,6 +652,8 @@ Provides: locale(kdebase4-openSUSE:hu) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:hu) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:hu) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:hu) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -667,6 +696,8 @@ Provides: locale(kdebase4-openSUSE:ko) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ko) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:ko) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:ko) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -709,6 +740,8 @@ Provides: locale(kdebase4-openSUSE:da) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:da) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:da) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:da) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -751,6 +784,8 @@ Provides: locale(kdebase4-openSUSE:sv) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:sv) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:sv) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:sv) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -793,6 +828,8 @@ Provides: locale(kdebase4-openSUSE:ru) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ru) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:ru) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:ru) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -835,6 +872,8 @@ Provides: locale(kdebase4-openSUSE:fi) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:fi) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:fi) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:fi) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -877,6 +916,8 @@ Provides: locale(kdebase4-openSUSE:nb) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:nb) +Provides: konqueror-plugins-lang = %(rpm -q --queryformat '%{VERSION}' konqueror-plugins-lang) +Provides: locale(konqueror-plugins:nb) Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) Provides: locale(konversation:nb) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -910,7 +951,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-kde4-lang PolicyKit-kde-lang amarok-lang digikam-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang +bash %SOURCE0 NetworkManager-kde4-lang PolicyKit-kde-lang amarok-lang digikam-lang kdebase4-openSUSE-lang kipi-plugins-lang konqueror-plugins-lang konversation-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang if test kde = kde; then # pretty evil hack to keep the symlinks working langs=`cd $RPM_BUILD_ROOT/usr/share/doc-bundle/kde/HTML && ls -1d *` ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.iHrGA3/_old 2009-08-03 16:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iHrGA3/_new 2009-08-03 16:19:09.000000000 +0200 @@ -22,7 +22,7 @@ License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 9 +Release: 10 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.iHrGA3/_old 2009-08-03 16:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iHrGA3/_new 2009-08-03 16:19:09.000000000 +0200 @@ -11,7 +11,6 @@ balsa-lang gnome-extras banshee-1-lang gnome bash-lang common -beagle-lang gnome bluez-gnome-lang gnome bombermaze-lang gnome-extras brasero-lang gnome @@ -120,6 +119,7 @@ istanbul-lang gnome-extras kdebase4-openSUSE-lang kde kipi-plugins-lang kde +konqueror-plugins-lang kde konversation-lang kde ktorrent-lang kde libbonobo-lang common @@ -183,7 +183,6 @@ system-config-printer-lang gnome tar-lang common tasque-lang gnome -tomboy-lang gnome totem-lang gnome totem-pl-parser-lang gnome transmission-lang gnome-extras ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libchipcard4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package libchipcard4 for openSUSE:Factory checked in at Sat Aug 1 13:34:13 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/libchipcard4/libchipcard4.changes 2009-06-30 14:56:35.000000000 +0200 @@ -0,0 +1,215 @@ +------------------------------------------------------------------- +Tue Jun 30 14:50:57 CEST 2009 - mkudlvasr(a)suse.cz + +- update to 4.2.8 + +------------------------------------------------------------------- +Mon May 12 19:37:42 CEST 2008 - coolo(a)suse.de + +- fix update of 10.1 + +------------------------------------------------------------------- +Tue Apr 15 17:31:50 CEST 2008 - schwab(a)suse.de + +- Fix configure script. + +------------------------------------------------------------------- +Fri Nov 9 05:00:07 CET 2007 - crrodriguez(a)suse.de + +- fix build adding missing prereq insserv_prereq fillup_prereq +- update to version 3.0.4 +- added reader description for new Cyberjack readers +- remove static libraries and "la" files + +------------------------------------------------------------------- +Fri Aug 3 08:56:11 CEST 2007 - aj(a)suse.de + +- Add gcc-c++ to build requires. + +------------------------------------------------------------------- +Mon Jul 30 19:13:48 CEST 2007 - sbrabec(a)suse.cz + +- Package branched to libchipcard3. +- Updated to version 3.0.3: + * Design changes. + * New API. + * See NEWS for details. +- Build and install apidoc. + +------------------------------------------------------------------- +Wed May 16 21:32:29 CEST 2007 - olh(a)suse.de + +- Buildrequires libusb -> libusb-devel + +------------------------------------------------------------------- +Wed Sep 27 12:03:36 CEST 2006 - stbinner(a)suse.de + +- Update to version 2.1.9: + * remove an annoying log message on no-PCMCIA systems + * work with the latest generic CCID driver + * fix a bug which prevented autodetecting of PCMCIA devices + * this version now works with OpenSC 0.11.x as well + +------------------------------------------------------------------- +Mon Jul 17 08:26:42 CEST 2006 - stbinner(a)suse.de + +- Update to version 2.1.7: + * allows readers without a keyboard to verify the pin of a + chipcard again. + * fixes a problem with newer GeldKarte cards + * now uses LibSysFS primarily to detect /dev/ttyUSB devices + +------------------------------------------------------------------- +Tue Jun 20 08:59:23 CEST 2006 - stbinner(a)suse.de + +- Update to version 2.1.6: + * no longer requires the kernel sources to provide support for + PCMCIA autoconfiguration + * no longer needs a specially compiled version of libccid to + work with that driver; the normal binary packages suffice. + +------------------------------------------------------------------- +Tue May 16 16:27:33 CEST 2006 - sbrabec(a)suse.cz + +- Fixed BuildRequires. + +------------------------------------------------------------------- +Mon May 15 19:28:24 CEST 2006 - sbrabec(a)suse.cz + +- Obsolete libchipcard-tools. + +------------------------------------------------------------------- +Tue May 9 19:45:36 CEST 2006 - sbrabec(a)suse.cz + +- Updated to version 2.1.4 (libchipcard2). + +------------------------------------------------------------------- +Wed Jan 25 21:37:24 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 11 21:22:05 CET 2006 - stbinner(a)suse.de + +- fix nfb + +------------------------------------------------------------------- +Mon Dec 19 17:38:27 CET 2005 - dmueller(a)suse.de + +- fix file list + +------------------------------------------------------------------- +Tue Aug 2 00:34:59 CEST 2005 - dmueller(a)suse.de + +- fix m4 quoting warning + +------------------------------------------------------------------- +Mon Apr 11 11:12:11 CEST 2005 - coolo(a)suse.de + +- fix one 64bit problem with gcc4 + +------------------------------------------------------------------- +Thu Feb 17 01:11:10 CET 2005 - ro(a)suse.de + +- fixed file list + +------------------------------------------------------------------- +Sat Jan 22 01:40:04 CET 2005 - ro(a)suse.de + +- fix build after pcsc-lite update + +------------------------------------------------------------------- +Fri Nov 19 09:58:45 CET 2004 - coolo(a)suse.de + +- cleaning up desktop files + +------------------------------------------------------------------- +Wed Aug 4 10:45:34 CEST 2004 - coolo(a)suse.de + +- libtoolize so the tools are in sync + +------------------------------------------------------------------- +Fri Apr 16 09:05:42 CEST 2004 - coolo(a)suse.de + +- build without unsermake + +------------------------------------------------------------------- +Sat Mar 13 16:56:23 CET 2004 - coolo(a)suse.de + +- fixing encoding of the desktop file + +------------------------------------------------------------------- +Tue Mar 2 12:31:36 CET 2004 - ro(a)suse.de + +- fix build on s390,s390x + +------------------------------------------------------------------- +Thu Oct 30 14:12:52 CET 2003 - ro(a)suse.de + +- fix build libchipcard-kde (include local m4 macros) + +------------------------------------------------------------------- +Wed Sep 10 08:23:25 CEST 2003 - coolo(a)suse.de + +- add restart|stop calls to the %p* scripts (#29025) + +------------------------------------------------------------------- +Tue Aug 12 16:09:59 CEST 2003 - ro(a)suse.de + +- fix patch/build for lib64 + +------------------------------------------------------------------- +Sat Aug 9 17:02:43 CEST 2003 - adrian(a)suse.de + +- add Categories +- update to version 0.9.1 + +------------------------------------------------------------------- +Thu Jul 31 16:15:46 CEST 2003 - meissner(a)suse.de + +- do not leave -L/usr/lib references on lib64 systems, to + avoid confusion on biarch systems. + +------------------------------------------------------------------- +Tue Jul 22 16:48:26 CEST 2003 - coolo(a)suse.de + +- don't give libtool a chance to leave build root traces + +------------------------------------------------------------------- +Thu Jun 12 07:56:34 CEST 2003 - coolo(a)suse.de + +- running ldconfig +- packaging directories +- adding require on lib package +- putting translations into %lang + +------------------------------------------------------------------- +Fri May 16 09:31:46 CEST 2003 - coolo(a)suse.de + +- giving Mads reasons + +------------------------------------------------------------------- +Thu Apr 10 13:25:55 CEST 2003 - coolo(a)suse.de + +- updating to 0.8.2 and fixing file list + +------------------------------------------------------------------- +Tue Feb 18 10:10:13 CET 2003 - coolo(a)suse.de ++++ 18 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/libchipcard4/libchipcard4.changes calling whatdependson for head-i586 New: ---- libchipcard4-4.2.8.tar.bz2 libchipcard4.changes libchipcard4.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchipcard4.spec ++++++ # # spec file for package libchipcard4 (Version 4.2.8) # # Copyright (c) 2009 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/ # Name: libchipcard4 BuildRequires: doxygen gcc-c++ graphviz graphviz-gd gwenhywfar-devel libusb-devel opensc-devel pkg-config sysfsutils xorg-x11-fonts License: GPL v2 or later Group: Hardware/Other Version: 4.2.8 Release: 1 Summary: A Library That Allows Easy Access to Smart Cards (Chipcards) Url: http://www.libchipcard.de/ Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq %description Libchipcard allows easy access to smart cards. It provides basic access to memory and processor cards and has special support for German medical cards, German "Geldkarten," and HBCI (home banking) cards (both type 0 and type 1). It accesses the readers via CTAPI or PC/SC interfaces and has successfully been tested with Towitoko, Kobil, and Reiner-SCT readers. Authors: -------- Martin Preu� <martin(a)libchipcard.de> %package devel License: GPL v2 or later Group: Development/Libraries/C and C++ Summary: Include Files and Libraries mandatory for Development Requires: %{name} = %{version} gwenhywfar-devel libusb-devel pcsc-lite-devel sysfsutils %description devel This package contains all necessary include files and libraries needed to develop applications that require these. Authors: -------- Martin Preu� <martin(a)libchipcard.de> %prep %setup -q %build ACLOCAL="aclocal -I m4" autoreconf -f -i %configure\ --enable-release\ --enable-full-doc \ --disable-static \ --with-pic make %{?jobs:-j%jobs} make srcdoc %{?jobs:-j%jobs} %install %makeinstall chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/chipcard4/server/chipcardd4 chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/chipcardd4 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} cp -a AUTHORS COPYING ChangeLog NEWS README TODO apidoc $RPM_BUILD_ROOT%{_docdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %preun %{stop_on_removal chipcardd4} %post /sbin/ldconfig %{fillup_and_insserv chipcardd4} %postun /sbin/ldconfig %{restart_on_update chipcardd4} %{insserv_cleanup} %files %defattr (-, root, root) %doc %{_docdir}/%{name} %exclude %{_docdir}/%{name}/apidoc %{_bindir}/* %exclude %{_bindir}/*-config %{_datadir}/chipcard4 %{_libdir}/*.so.* %{_libdir}/chipcard4 %{_libdir}/gwenhywfar/plugins/38/crypttoken/* %{_sbindir}/* %config %{_sysconfdir}/chipcard4 %{_sysconfdir}/init.d/chipcardd4 %files devel %defattr (-, root, root) %doc %{_docdir}/%{name}/apidoc %{_bindir}/*-config %{_libdir}/*.so %{_datadir}/aclocal/*.m4 %{_includedir}/* %exclude %{_libdir}/*.*a %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 evolution-data-server for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package evolution-data-server for openSUSE:Factory checked in at Sat Aug 1 13:23:59 CEST 2009. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2009-05-27 18:10:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server.changes 2009-07-31 20:43:58.000000000 +0200 @@ -1,0 +2,77 @@ +Fri Jul 31 20:42:51 CEST 2009 - vuntz(a)novell.com + +- Correctly comment out patch that needs rebasing. + +------------------------------------------------------------------- +Thu Jul 23 20:35:21 CEST 2009 - dominique-obs(a)leuenberger.net + +- Update to version 2.27.4: + + Addressbook: + - bgo#540779 - Do not call e_book_new in the main thread + - bgo#563668 - Do not pop-down an empty completion list + - bgo#586225 - Parse numeric name suffixes + + Calendar: + - bgo#548702 - google calendar source does not show all events + - CalDav Fixes/improvements + + Mail: + - bgo#575701 - Message disappear from unread vfolder on reply + - bgo#568302 - create camel summary table if not exists on load + - bgo#586602 - folder messages are lost on folder rename + - bgo#327285 - Word "Success" in error message for failed + action + - bgo#587699 - IMAP - Localize only Inbox folder name, no other + - bgo#579065 - IMAP - Synchronize remote mail locally is not + working + - bgo#564388 - UI blocks for a long time when downloading mails + with nntp + + Misc: + - bgo#586442 - Various build cleanups + - bgo#586477 - Fix quoting in configure.ac + - bgo#586811 - Require automake 1.9 and fix whitespace + - bgo#586813 - Fix iconv cflags/libs in configure.ac + - bgo#586809 - Enable "silent rules" automake 1.11 option + - bgo#587165 - Double free in initialize_categories + - bgo#587374 - iconv test broken on some gcc + - Use G_BEGIN_DECLS / G_END_DECLS macros + - Work around deprecation of g_mapped_file_free() + - Silence some compiler warnings + - Fixes for windows build +- Changes from version 2.27.3: + + bgo#583507 - Fix for evolution hang while updating search + folder. + + bgo#585327 - Attaching a message via drag and drop doesn't work + for GW provider + + bgo#266678 - Renaming LDAP contacts CN breaks DN + + bgo#580198 - IMAP offline mode improvement + + bgo#584797 - Do not set internal SQLite3 structures on error + + bgo#580212 - Report errors in CamelException when verifying + signature + + bgo#559345 - Support CalDAV free/busy extension + + bgo#337082 - Do not return folders with empty names + + bgo#584101 - Configure fails with kerberos and + LDFLAGS="-Wl,--as-needed" + + bgo#584030 - New API function for ESourceSelectorDialog + + bgo#583344 - do not leak pipe handles + + bgo#562015 - CalDAV - Store CTag in a cache + + bnc#506265 - do not reset the meeting date to delivered date + + bgo#583528 - Hints of missing mails in Gw + + bgo#582643 - Deleted mails are not immediately synced + + bgo#543069 - Support detached instances in CalDAV + + bgo#559980 - Harden WebDAV contact backend by checking for etag + being NULL + + Other Fixes: + - Support for header based threading in GroupWise provider + - Compiler warnings and white space cleanup + - Correctly dispose the source in EBookBackend. Code cleanup + - Instead of duplicating libgnome function, use corresponding + glib functions + - Make the backend factory type const + + Updated translations +- Upstreamed Patches: + + eds-comp-percent.diff +- Rebased Patches: + + dice-eds-changes.patch +- Patch needs rebase: + + bnc-210959-eds-accept_ics.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- eds-comp-percent.diff evolution-data-server-2.27.2.tar.bz2 New: ---- evolution-data-server-2.27.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.hQMUXS/_old 2009-08-01 13:23:53.000000000 +0200 +++ /var/tmp/diff_new_pack.hQMUXS/_new 2009-08-01 13:23:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package evolution-data-server (Version 2.27.2) +# spec file for package evolution-data-server (Version 2.27.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,23 +58,21 @@ Obsoletes: evolution-data-server-32bit %endif Summary: Evolution Data Server -Version: 2.27.2 +Version: 2.27.4 Release: 1 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{… -# PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. -Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch -# PATCH-FIX-UPSTREAM bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo. -Patch4: bnc-304835-ex-crash-after-restart.patch -# PATCH-FIX-UPSTREAM bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo. -Patch5: bnc-307861-calendar-auth.diff +# PATCH-NEEDS-REBASE evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM) +#Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch +# PATCH-NEEDS-REBASE bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM) +#Patch4: bnc-304835-ex-crash-after-restart.patch +# PATCH-NEEDS-REBASE bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM) +#Patch5: bnc-307861-calendar-auth.diff # PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill(a)novell.com -- Patch yet to be pushed upstream Patch7: dice-eds-changes.patch -# PATCH-FIX-UPSTREAM bnc-210959-eds-accept_ics.patch bnc210959 pchenthill(a)novell.com -- Patch yet to be pushed upstream. -Patch16: bnc-210959-eds-accept_ics.patch +# PATCH-NEEDS-REBASE bnc-210959-eds-accept_ics.patch bnc210959 pchenthill(a)novell.com -- Patch yet to be pushed upstream. (Was: PATCH-FIX-UPSTREAM) +#Patch16: bnc-210959-eds-accept_ics.patch # PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj(a)novell.com -- Migrate to shared NSS database. Patch18: evolution-data-server-shared-nss-db.patch -# PATCH-FIX-UPSTREAM eds-comp-percent.diff pchenthill(a)suse.de -- API freeze = Patch will be upstream only in 2.27.x -Patch19: eds-comp-percent.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -148,9 +146,9 @@ ###%patch4 ###%patch5 %patch7 -p1 -%patch16 +# NEEDS REBASE +# %%patch16 %patch18 -p1 -%patch19 -p1 %build intltoolize --force --copy ++++++ dice-eds-changes.patch ++++++ --- /var/tmp/diff_new_pack.hQMUXS/_old 2009-08-01 13:23:53.000000000 +0200 +++ /var/tmp/diff_new_pack.hQMUXS/_new 2009-08-01 13:23:53.000000000 +0200 @@ -1,8 +1,7 @@ -diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c -index 70a65a3..d62760b 100644 ---- a/calendar/libecal/e-cal-component.c -+++ b/calendar/libecal/e-cal-component.c -@@ -162,6 +162,8 @@ struct _ECalComponentPrivate { +diff -ruN evolution-data-server-2.27.4/calendar/libecal/e-cal-component.c evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.c +--- evolution-data-server-2.27.4/calendar/libecal/e-cal-component.c 2009-07-13 07:22:19.000000000 +0200 ++++ evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.c 2009-07-22 11:44:43.000000000 +0200 +@@ -161,6 +161,8 @@ * object over the wire. */ guint need_sequence_inc : 1; @@ -11,7 +10,7 @@ }; /* Private structure for alarms */ -@@ -373,6 +375,9 @@ free_icalcomponent (ECalComponent *comp, gboolean free) +@@ -372,6 +374,9 @@ /* Free the subcomponents */ g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL); @@ -21,7 +20,7 @@ /* Clean up */ -@@ -528,6 +533,13 @@ e_cal_component_clone (ECalComponent *comp) +@@ -527,6 +532,13 @@ return new_comp; } @@ -35,7 +34,7 @@ /* Scans an attachment property */ static void scan_attachment (GSList **attachment_list, icalproperty *prop) -@@ -795,7 +807,8 @@ scan_property (ECalComponent *comp, icalproperty *prop) +@@ -793,7 +805,8 @@ case ICAL_LOCATION_PROPERTY : priv->location = prop; break; @@ -45,7 +44,7 @@ default: break; } -@@ -951,6 +964,9 @@ scan_icalcomponent (ECalComponent *comp) +@@ -949,6 +962,9 @@ g_assert (priv->icalcomp != NULL); @@ -55,7 +54,7 @@ /* Scan properties */ for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY); -@@ -1049,7 +1065,9 @@ e_cal_component_set_new_vtype (ECalComponent *comp, ECalComponentVType type) +@@ -1047,7 +1063,9 @@ case E_CAL_COMPONENT_TIMEZONE: kind = ICAL_VTIMEZONE_COMPONENT; break; @@ -66,7 +65,7 @@ default: g_assert_not_reached (); kind = ICAL_NO_COMPONENT; -@@ -1067,8 +1085,8 @@ e_cal_component_set_new_vtype (ECalComponent *comp, ECalComponentVType type) +@@ -1065,8 +1083,8 @@ scan_icalcomponent (comp); /* Add missing stuff */ @@ -77,7 +76,7 @@ } /** -@@ -1091,6 +1109,7 @@ e_cal_component_set_icalcomponent (ECalComponent *comp, icalcomponent *icalcomp) +@@ -1089,6 +1107,7 @@ { ECalComponentPrivate *priv; icalcomponent_kind kind; @@ -85,7 +84,7 @@ g_return_val_if_fail (comp != NULL, FALSE); g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); -@@ -1113,13 +1132,17 @@ e_cal_component_set_icalcomponent (ECalComponent *comp, icalcomponent *icalcomp) +@@ -1111,13 +1130,17 @@ || kind == ICAL_VTODO_COMPONENT || kind == ICAL_VJOURNAL_COMPONENT || kind == ICAL_VFREEBUSY_COMPONENT @@ -105,7 +104,7 @@ return TRUE; } -@@ -1158,6 +1181,7 @@ void +@@ -1156,6 +1179,7 @@ e_cal_component_rescan (ECalComponent *comp) { ECalComponentPrivate *priv; @@ -113,7 +112,7 @@ g_return_if_fail (comp != NULL); g_return_if_fail (E_IS_CAL_COMPONENT (comp)); -@@ -1169,7 +1193,10 @@ e_cal_component_rescan (ECalComponent *comp) +@@ -1167,7 +1191,10 @@ /* Rescan */ scan_icalcomponent (comp); @@ -125,7 +124,7 @@ } /** -@@ -1230,6 +1257,9 @@ e_cal_component_get_vtype (ECalComponent *comp) +@@ -1228,6 +1255,9 @@ case ICAL_VTIMEZONE_COMPONENT: return E_CAL_COMPONENT_TIMEZONE; @@ -135,7 +134,7 @@ default: /* We should have been loaded with a supported type! */ g_assert_not_reached (); -@@ -2628,6 +2658,27 @@ e_cal_component_set_dtstart (ECalComponent *comp, ECalComponentDateTime *dt) +@@ -2620,6 +2650,27 @@ priv->need_sequence_inc = TRUE; } @@ -163,7 +162,7 @@ /** * e_cal_component_get_due: * @comp: A calendar component object. -@@ -4027,6 +4078,24 @@ e_cal_component_get_sequence (ECalComponent *comp, int **sequence) +@@ -4066,6 +4117,24 @@ **sequence = icalproperty_get_sequence (priv->sequence); } @@ -188,7 +187,7 @@ /** * e_cal_component_set_sequence: * @comp: A calendar component object. -@@ -6010,4 +6079,78 @@ e_cal_component_event_dates_match (ECalComponent *comp1, +@@ -6044,3 +6113,77 @@ return retval; } @@ -266,12 +265,10 @@ + + return -1; +} - -diff --git a/calendar/libecal/e-cal-component.h b/calendar/libecal/e-cal-component.h -index 52a8fdb..b8dc492 100644 ---- a/calendar/libecal/e-cal-component.h -+++ b/calendar/libecal/e-cal-component.h -@@ -51,7 +51,8 @@ typedef enum { +diff -ruN evolution-data-server-2.27.4/calendar/libecal/e-cal-component.h evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.h +--- evolution-data-server-2.27.4/calendar/libecal/e-cal-component.h 2009-07-13 07:22:19.000000000 +0200 ++++ evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.h 2009-07-22 11:44:43.000000000 +0200 +@@ -51,7 +51,8 @@ E_CAL_COMPONENT_TODO, E_CAL_COMPONENT_JOURNAL, E_CAL_COMPONENT_FREEBUSY, @@ -281,7 +278,7 @@ } ECalComponentVType; /* Field identifiers for a calendar component; these are used by the data model -@@ -256,6 +257,7 @@ void e_cal_component_set_dtend (ECalComponent *comp, ECalComponentDateTime *dt); +@@ -256,6 +257,7 @@ void e_cal_component_get_dtstamp (ECalComponent *comp, struct icaltimetype *t); void e_cal_component_set_dtstamp (ECalComponent *comp, struct icaltimetype *t); @@ -289,16 +286,16 @@ void e_cal_component_get_dtstart (ECalComponent *comp, ECalComponentDateTime *dt); void e_cal_component_set_dtstart (ECalComponent *comp, ECalComponentDateTime *dt); -@@ -309,6 +311,8 @@ gboolean e_cal_component_is_instance (ECalComponent *comp); - void e_cal_component_get_sequence (ECalComponent *comp, int **sequence); - void e_cal_component_set_sequence (ECalComponent *comp, int *sequence); +@@ -312,6 +314,8 @@ + void e_cal_component_get_sequence (ECalComponent *comp, gint **sequence); + void e_cal_component_set_sequence (ECalComponent *comp, gint *sequence); +int e_cal_component_get_sequence_as_int (ECalComponent *comp); + void e_cal_component_get_status (ECalComponent *comp, icalproperty_status *status); void e_cal_component_set_status (ECalComponent *comp, icalproperty_status status); -@@ -456,6 +460,10 @@ gboolean e_cal_component_alarm_has_attendees (ECalComponentAlarm *alarm); +@@ -457,6 +461,10 @@ icalcomponent *e_cal_component_alarm_get_icalcomponent (ECalComponentAlarm *alarm); ++++++ evolution-data-server-2.27.2.tar.bz2 -> evolution-data-server-2.27.4.tar.bz2 ++++++ GNOME/evolution-data-server/evolution-data-server-2.27.2.tar.bz2 /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server-2.27.4.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