March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit fritzing for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package fritzing for openSUSE:Factory checked in at 2013-03-01 07:19:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fritzing (Old) and /work/SRC/openSUSE:Factory/.fritzing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fritzing", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fritzing/fritzing.changes 2013-01-14 09:40:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fritzing.new/fritzing.changes 2013-03-01 07:19:13.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Feb 26 08:26:00 UTC 2013 - bugs(a)vdm-design.de + + - update to version 0.7.12b, now depends on boost-devel + * autorouter: remove excess bendpoints + * gerber export drill files now visible in MSN Gerber Viewer (set the m.n format to 2.4) + * Updated Dutch translation (thanks Davy) + * Updated Greek translation (thanks Alexander) + * hide individual part silkscreen + * imported parts now go to MyParts bin instead of Contrib + * PNG export now taking much less disk space (thanks Jerome) + * max pin count for generic IC bumped to 128 + * handful of fixes to DRC + * find part in sketch (text search) + * rgb led hole size enlarged + * lots of little bug fixes + +------------------------------------------------------------------- Old: ---- fritzing-0.7.11b.source.tar.bz2 New: ---- fritzing-0.7.12b.source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fritzing.spec ++++++ --- /var/tmp/diff_new_pack.NOwU9V/_old 2013-03-01 07:19:14.000000000 +0100 +++ /var/tmp/diff_new_pack.NOwU9V/_new 2013-03-01 07:19:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: fritzing -Version: 0.7.11b +Version: 0.7.12b Release: 0 Summary: Intuitive EDA platform featuring from prototype to product License: GPL-3.0+ @@ -26,6 +26,7 @@ Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}-%{version}.s… Requires: libqt4-sql-sqlite Requires: libqt4-x11 +BuildRequires: boost-devel BuildRequires: desktop-file-utils BuildRequires: libqt4-devel >= 4.7 %if 0%{?suse_version} || 0%{?sles_version} ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.NOwU9V/_old 2013-03-01 07:19:14.000000000 +0100 +++ /var/tmp/diff_new_pack.NOwU9V/_new 2013-03-01 07:19:14.000000000 +0100 @@ -1,3 +1,9 @@ +fritzing (0.7.12b-0) stable; urgency=low + + * new upstream release 0.7.12b + + -- Thomas Zimmermann <bugs(a)vdm-design.de> Tue, 26 Feb 2013 09:35:00 +0100 + fritzing (0.7.11b-0) stable; urgency=low * new upstream release 0.7.11b ++++++ debian.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control --- old/debian/control 2012-01-09 20:42:12.000000000 +0100 +++ new/debian/control 2013-02-26 09:34:03.000000000 +0100 @@ -2,13 +2,13 @@ Section: electronics Priority: optional Maintainer: Brendan Howell <brendan(a)howell-ersatz.com> -Build-Depends: debhelper (>= 7.0.12), libqtcore4, libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev +Build-Depends: debhelper (>= 7.0.12), libqtcore4 (>=4.7), libqtgui4 (>=4.7), libstdc++6, libc6, qt4-qmake, libqt4-dev (>=4.7), zlib1g-dev, libboost-dev Standards-Version: 3.8.3 Homepage: http://fritzing.org Package: fritzing Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4, libqt4-gui, libqt4-network, libqt4-sql, libqt4-svg, libqt4-xml, libqt4-sql-sqlite +Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (>=4.7), libqt4-gui (>=4.7), libqt4-network (>=4.7), libqt4-sql (>=4.7), libqt4-svg (>=4.7), libqt4-xml (>=4.7), libqt4-sql-sqlite (>=4.7) Description: Easy-to-use, electronic design software. Fritzing is an open source project designed to help one transition from a prototype to a finished project. Aimed at users who want to produce or document ++++++ fritzing-0.7.11b.source.tar.bz2 -> fritzing-0.7.12b.source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/fritzing/fritzing-0.7.11b.source.tar.bz2 /work/SRC/openSUSE:Factory/.fritzing.new/fritzing-0.7.12b.source.tar.bz2 differ: char 4, line 1 ++++++ fritzing.dsc ++++++ --- /var/tmp/diff_new_pack.NOwU9V/_old 2013-03-01 07:19:14.000000000 +0100 +++ /var/tmp/diff_new_pack.NOwU9V/_new 2013-03-01 07:19:14.000000000 +0100 @@ -1,10 +1,10 @@ Format: 1.0 Source: fritzing -Version: 0.7.11b +Version: 0.7.12b Binary: fritzing Maintainer: Brendan Howell <brendan(a)howell-ersatz.com> Architecture: any -Build-Depends: debhelper (>= 7.0.12), libqtcore4, libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev, libqt4-sql-sqlite +Build-Depends: debhelper (>= 7.0.12), libqtcore4 (>=4.7), libqtgui4 (>=4.7), libstdc++6, libc6, qt4-qmake, libqt4-dev (>=4.7), zlib1g-dev, libqt4-sql-sqlite (>=4.7), libboost-dev Files: - 8ea0765b8fd31874da0ee00515a68576 10808479 fritzing-0.7.11b.source.tar.gz - efb141873b5a828420c39eec1e79b364 915 debian.tar.gz + 8ea0765b8fd31874da0ee00515a68576 10808479 fritzing-0.7.12b.source.tar.gz + bc4a6dc116f0d762cdf5a374b5e865f9 1200 debian.tar.gz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit file for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2013-03-01 07:17:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "file", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2013-02-19 16:17:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.file.new/file.changes 2013-03-01 07:17:37.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Feb 26 17:33:36 UTC 2013 - werner(a)suse.de + +- Add patch file-5.13-return.patch: avoid doubled return + +------------------------------------------------------------------- +Fri Feb 22 10:14:36 UTC 2013 - werner(a)suse.de + +- Update to file version 5.13 (mainly bug fixes) + * add elf reading of debug info to determine if file is stripped + * use pread() + * change mime description size from 64 to 80 to accommodate OOXML. + * Warn about inconsistent continuation levels. + * Change fsmagic to add a space after it prints. + * Make getline public so that file can link against it. + Perhaps it is better to rename it, or hide it differently. + Fixes builds on platforms that do not provide it. + * Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document + what long, int, short, etc is (Guy Harris) + * add magic_version function and constant + * Redo memory allocation and de-allocation. + (prevents double frees on non mmap platforms) + * Fix bug with name/use having to do with passing + found state from the parent to the child and back. + +------------------------------------------------------------------- Old: ---- file-5.12-llong.dif file-5.12-upstream.patch file-5.12.dif file-5.12.tar.gz New: ---- file-5.13-return.patch file-5.13.dif file-5.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.8p7erb/_old 2013-03-01 07:17:38.000000000 +0100 +++ /var/tmp/diff_new_pack.8p7erb/_new 2013-03-01 07:17:38.000000000 +0100 @@ -30,16 +30,15 @@ %endif # # Set Version also in python-magic.spec -Version: 5.12 +Version: 5.13 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause Group: Productivity/File utilities Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf -Patch: file-5.12.dif +Patch: file-5.13.dif Patch1: file-5.12-misc.dif -Patch2: file-5.12-llong.dif Patch4: file-4.24-autoconf.dif Patch5: file-4.03-tex.dif Patch7: file-4.20-ssd.dif @@ -62,7 +61,8 @@ Patch33: file-5.12-ocloexec.patch Patch34: file-5.12-endian.patch Patch35: file-5.12-nitpick.dif -Patch42: file-5.12-upstream.patch +# PATCH-FIX-UPSTREAM: avoid doubled return +Patch36: file-5.13-return.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -103,9 +103,7 @@ %prep %setup -q -n file-%{version} -%patch42 -p1 %patch1 -p0 -b .misc -%patch2 -p0 -b .llong %patch4 -p0 -b .conf %patch5 -p0 -b .tex %patch7 -p0 -b .ssd @@ -130,7 +128,10 @@ %patch33 -p0 -b .clexe %patch34 -p0 -b .endian %patch35 -p0 -b .nitpick +%patch36 -p0 -b .return %patch -b .0 +test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in + %build export LANG=POSIX export LC_ALL=POSIX ++++++ file-5.13-return.patch ++++++ --- src/cdf.c +++ src/cdf.c 2013-02-26 17:30:21.073444930 +0000 @@ -250,8 +250,6 @@ cdf_read(const cdf_info_t *info, off_t o if (info->i_fd == -1) return -1; - return -1; - if (pread(info->i_fd, buf, len, off) != (ssize_t)len) return -1; ++++++ file-5.12-llong.dif -> file-5.13.dif ++++++ --- /work/SRC/openSUSE:Factory/file/file-5.12-llong.dif 2013-01-29 06:55:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.file.new/file-5.13.dif 2013-03-01 07:17:37.000000000 +0100 @@ -1,10 +1,586 @@ ---- configure.ac -+++ configure.ac 2013-01-23 12:57:44.605952352 +0000 -@@ -107,6 +107,7 @@ AC_TYPE_UINT32_T - AC_TYPE_INT32_T - AC_TYPE_UINT64_T - AC_TYPE_INT64_T -+AC_CHECK_SIZEOF(long long) - AC_FUNC_MMAP - AC_FUNC_FORK - AC_FUNC_MBRTOWC +--- magic/Magdir/elf ++++ magic/Magdir/elf 2013-01-22 15:12:11.000000000 +0000 +@@ -127,7 +127,7 @@ + >18 leshort 47 Renesas H8/300H, + >18 leshort 48 Renesas H8S, + >18 leshort 49 Renesas H8/500, +->18 leshort 50 IA-64, ++>18 leshort 50 IA-64 (Intel 64 bit architecture), + >18 leshort 51 Stanford MIPS-X, + >18 leshort 52 Motorola Coldfire, + >18 leshort 53 Motorola M68HC12, +--- magic/Magdir/linux ++++ magic/Magdir/linux 2013-01-22 15:16:41.000000000 +0000 +@@ -97,22 +97,44 @@ + # and Nicolas Lichtmaier <nick(a)debian.org> + # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 + # Linux kernel boot images (i386 arch) (Wolfram Kleff) +-514 string HdrS Linux kernel ++514 string HdrS Linux + !:strength + 5 +->510 leshort 0xAA55 x86 boot executable +->>518 leshort >0x1ff +->>>529 byte 0 zImage, +->>>529 byte 1 bzImage, +->>>(526.s+0x200) string >\0 version %s, +->>498 leshort 1 RO-rootFS, +->>498 leshort 0 RW-rootFS, +->>508 leshort >0 root_dev 0x%X, +->>502 leshort >0 swap_dev 0x%X, +->>504 leshort >0 RAMdisksize %u KB, +->>506 leshort 0xFFFF Normal VGA +->>506 leshort 0xFFFE Extended VGA +->>506 leshort 0xFFFD Prompt for Videomode +->>506 leshort >0 Video mode %d ++>510 leshort 0xAA55 \b/x86 Kernel ++>510 leshort <0xAA55 Kernel ++>510 leshort >0xAA55 Kernel ++>518 leshort 0x0105 \b, Setup Version 0x105, zImage ++>518 leshort >0x0105 \b, Setup Version %#hx ++>>529 byte 0 \b, zImage ++>>529 byte 1 \b, bzImage ++>>>(526.s+0x205) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x205) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x208) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %8.8s ++>>>(526.s+0x209) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %9.9s ++>>>(526.s+0x20a) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %10.10s ++>>>(526.s+0x20b) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>498 leshort 1 \b, RO-rootFS ++>>498 leshort 0 \b, RW-rootFS ++>>508 leshort >0 \b, root_dev 0x%X ++>>502 leshort >0 \b, swap_dev 0x%X ++>>504 leshort >0 \b, RAMdisksize %u KB ++>>506 leshort 0xFFFF \b, Normal VGA ++>>506 leshort 0xFFFE \b, Extended VGA ++>>506 leshort 0xFFFD \b, Prompt for Videomode ++>>506 leshort >0 \b, Video mode %d + # This also matches new kernels, which were caught above by "HdrS". + 0 belong 0xb8c0078e Linux kernel + >0x1e3 string Loading version 1.3.79 or older +--- magic/Magdir/msad ++++ magic/Magdir/msad 2006-03-27 11:29:19.000000000 +0000 +@@ -0,0 +1,5 @@ ++#------------------------------------------------------------------------------ ++# msad: file(1) magic for msad ++# Microsoft visual C ++# This must precede the heuristic for raw G3 data ++4 string Standard\ Jet\ DB Microsoft Access Database +--- magic/Magdir/msdos ++++ magic/Magdir/msdos 2011-06-14 14:36:26.000000000 +0000 +@@ -99,9 +99,9 @@ + >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) + >>>(0x3c.l+22) leshort&0x1000 >0 system file + >>>(0x3c.l+24) leshort 0x010b +->>>>(0x3c.l+232) lelong >0 Mono/.Net assembly ++>>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly + >>>(0x3c.l+24) leshort 0x020b +->>>>(0x3c.l+248) lelong >0 Mono/.Net assembly ++>>>>(0x3c.l+248) lelong >0 \b, Mono/.Net assembly + + # hooray, there's a DOS extender using the PE format, with a valid PE + # executable inside (which just prints a message and exits if run in win) +--- magic/Makefile.am ++++ magic/Makefile.am 2013-01-22 15:19:21.000000000 +0000 +@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir + MAGIC_DIR = $(top_srcdir)/magic + MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) + +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + + EXTRA_DIST = \ + $(MAGIC_DIR)/Header \ +@@ -20,7 +20,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/aout \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/assembler \ +@@ -73,7 +72,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -111,6 +109,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/javascript \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/keepass \ +@@ -118,7 +118,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ +@@ -126,7 +125,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/m4 \ + $(MAGIC_FRAGMENT_DIR)/mach \ + $(MAGIC_FRAGMENT_DIR)/macos \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/make \ +@@ -145,10 +143,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msooxml \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ +@@ -190,6 +188,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ + $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/revision \ + $(MAGIC_FRAGMENT_DIR)/riff \ ++$(MAGIC_FRAGMENT_DIR)/apple \ ++$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/rinex \ + $(MAGIC_FRAGMENT_DIR)/rpm \ + $(MAGIC_FRAGMENT_DIR)/rtf \ +@@ -258,8 +258,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ++CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} ++ ++${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) ++ cat /dev/null > $@ ++ for frag in $(EXTRA_DIST); do \ ++ if test -f $(srcdir)/$$frag; then \ ++ f=$(srcdir)/$$frag; \ ++ else \ ++ f=$$frag; \ ++ fi; \ ++ cat $$f; \ ++ done >> $@ + + # FIXME: Build file natively as well so that it can be used to compile + # the target's magic file; for now we bail if the local version does not match +@@ -271,19 +283,22 @@ FILE_COMPILE = $(top_builddir)/src/file + FILE_COMPILE_DEP = $(FILE_COMPILE) + endif + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- @rm -fr magic +- @mkdir magic && cp -p $(EXTRA_DIST) magic +- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ +- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ +- else \ +- v=$$(file --version | sed -e s/file-// -e q); \ +- if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ +- echo "Cannot use the installed version of file ($$v) to"; \ +- echo "cross-compile file ${PACKAGE_VERSION}"; \ +- echo "Please install file ${PACKAGE_VERSION} locally first"; \ +- exit 1; \ +- fi; \ +- fi) +- $(FILE_COMPILE) -C -m magic +- @rm -fr magic ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW) ++ ++#${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) ++# @rm -fr magic ++# @mkdir magic && cp -p $(EXTRA_DIST) magic ++# @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ ++# echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ ++# else \ ++# v=$$(file --version | sed -e s/file-// -e q); \ ++# if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ ++# echo "Cannot use the installed version of file ($$v) to"; \ ++# echo "cross-compile file ${PACKAGE_VERSION}"; \ ++# echo "Please install file ${PACKAGE_VERSION} locally first"; \ ++# exit 1; \ ++# fi; \ ++# fi) ++# $(FILE_COMPILE) -C -m magic ++# @rm -fr magic +--- magic/Makefile.in ++++ magic/Makefile.in 2013-01-22 15:20:19.000000000 +0000 +@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@ + MAGIC_FRAGMENT_BASE = Magdir + MAGIC_DIR = $(top_srcdir)/magic + MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + EXTRA_DIST = \ + $(MAGIC_DIR)/Header \ + $(MAGIC_DIR)/Localstuff \ +@@ -218,7 +218,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/aout \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/assembler \ +@@ -271,7 +270,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -309,6 +307,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/javascript \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/keepass \ +@@ -316,7 +316,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ +@@ -324,7 +323,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/m4 \ + $(MAGIC_FRAGMENT_DIR)/mach \ + $(MAGIC_FRAGMENT_DIR)/macos \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/make \ +@@ -343,10 +341,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msooxml \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ +@@ -388,6 +386,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ + $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/revision \ + $(MAGIC_FRAGMENT_DIR)/riff \ ++$(MAGIC_FRAGMENT_DIR)/apple \ ++$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/rinex \ + $(MAGIC_FRAGMENT_DIR)/rpm \ + $(MAGIC_FRAGMENT_DIR)/rtf \ +@@ -456,10 +456,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ++CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} + @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file + ++${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) ++ cat /dev/null > $@ ++ for frag in $(EXTRA_DIST); do \ ++ if test -f $(srcdir)/$$frag; then \ ++ f=$(srcdir)/$$frag; \ ++ else \ ++ f=$$frag; \ ++ fi; \ ++ cat $$f; \ ++ done >> $@ ++ + # FIXME: Build file natively as well so that it can be used to compile + # the target's magic file; for now we bail if the local version does not match + @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file +@@ -674,23 +686,25 @@ uninstall-am: uninstall-pkgdataDATA + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-pkgdataDATA + ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- @rm -fr magic +- @mkdir magic && cp -p $(EXTRA_DIST) magic +- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ +- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ +- else \ +- v=$$(file --version | sed -e s/file-// -e q); \ +- if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ +- echo "Cannot use the installed version of file ($$v) to"; \ +- echo "cross-compile file ${PACKAGE_VERSION}"; \ +- echo "Please install file ${PACKAGE_VERSION} locally first"; \ +- exit 1; \ +- fi; \ +- fi) +- $(FILE_COMPILE) -C -m magic +- @rm -fr magic ++#${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) ++# @rm -fr magic ++# @mkdir magic && cp -p $(EXTRA_DIST) magic ++# @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ ++# echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ ++# else \ ++# v=$$(file --version | sed -e s/file-// -e q); \ ++# if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ ++# echo "Cannot use the installed version of file ($$v) to"; \ ++# echo "cross-compile file ${PACKAGE_VERSION}"; \ ++# echo "Please install file ${PACKAGE_VERSION} locally first"; \ ++# exit 1; \ ++# fi; \ ++# fi) ++# $(FILE_COMPILE) -C -m magic ++# @rm -fr magic + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +--- src/Makefile.am ++++ src/Makefile.am 2008-04-14 15:14:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-MAGIC = $(pkgdatadir)/magic ++MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic + lib_LTLIBRARIES = libmagic.la + include_HEADERS = magic.h + +--- src/dcore.c ++++ src/dcore.c 2006-03-27 11:29:19.000000000 +0000 +@@ -0,0 +1,207 @@ ++/* ++ * Show goo about ELF core files ++ * Jeremy Fitzhardinge <jeremy(a)zip.com.au> 1996 ++ */ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <string.h> ++#if defined __GLIBC__ && __GLIBC__ >= 2 ++#include <elf.h> ++#include <sys/procfs.h> ++# ifndef NT_PRFPREG ++# define NT_PRFPREG 2 ++# endif ++# ifndef NT_TASKSTRUCT ++# define NT_TASKSTRUCT 4 ++# endif ++#else ++#include <linux/elf.h> ++#include <linux/elfcore.h> ++#endif ++ ++static void fperror(const char *str) ++{ ++ perror(str); ++ exit(1); ++} ++ ++static size_t myread(int fd, void *buf, size_t sz) ++{ ++ size_t ret; ++ ++ if ((ret = read(fd, buf, sz)) != sz) ++ fperror("read failed"); ++ return ret; ++} ++ ++static void print_prstatus(const prstatus_t *pr) ++{ ++ unsigned i; ++ static const char *regs[] = { "ebx", "ecx", "edx", "esi", "edi", "ebp", ++ "eax", "ds", "es", "fs", "gs", ++ "orig_eax", "eip", "cs", ++ "efl", "uesp", "ss"}; ++ ++ printf(" pid=%d ppid=%d pgrp=%d sid=%d\n", ++ pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid); ++ for(i = 0; i < NGREG; i++) ++ { ++ unsigned long val = pr->pr_reg[i]; ++ printf(" %-2u %-5s=%08lx %lu\n", i, regs[i], val, val); ++ } ++} ++ ++static void print_prpsinfo(const prpsinfo_t *ps) ++{ ++ printf(" uid=%d gid=%d\n", ps->pr_uid, ps->pr_gid); ++ printf(" comm=%s\n", ps->pr_fname); ++ printf(" psargs=%s\n", ps->pr_psargs); ++} ++ ++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) ++ ++static void do_note(int fd, Elf32_Phdr *phdr) ++{ ++ off_t here = lseek(fd, 0, SEEK_CUR); ++ int size = phdr->p_filesz; ++ char *raw = alloca(size), *end; ++ end = raw+size; ++ ++ lseek(fd, phdr->p_offset, SEEK_SET); ++ myread(fd, raw, size); ++ ++ while(raw < end) ++ { ++ Elf32_Nhdr *note = (Elf32_Nhdr *)raw; ++ const char *str; ++ const char *name, *desc; ++ ++ raw += sizeof(*note); ++ name = raw; ++ raw += roundup(note->n_namesz, sizeof(long)); ++ desc = raw; ++ raw += roundup(note->n_descsz, sizeof(long)); ++ ++ printf(" name=%.*s", (int)note->n_namesz, name); ++ ++ if(strncmp(name, "CORE", note->n_namesz) != 0) ++ { ++ printf("\n"); ++ continue; ++ } ++ ++ switch(note->n_type) ++ { ++#define X(x) case x: str = #x; break; ++ X(NT_PRSTATUS); ++ X(NT_PRFPREG); ++ X(NT_PRPSINFO); ++ X(NT_TASKSTRUCT); ++#undef X ++ default: ++ str = "???"; ++ } ++ printf(" n_type=%s n_descsz=%ld\n", ++ str, note->n_descsz); ++ switch(note->n_type) ++ { ++ case NT_PRSTATUS: ++ print_prstatus((prstatus_t *)desc); ++ break; ++ case NT_PRPSINFO: ++ print_prpsinfo((prpsinfo_t *)desc); ++ break; ++ } ++ } ++ lseek(fd, here, SEEK_SET); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int fd; ++ Elf32_Ehdr elf; ++ int i; ++ ++ if (argc != 2) ++ { ++ fprintf(stderr, "Usage: %s corefile\n", argv[0]); ++ exit(1); ++ } ++ ++ if ((fd = open(argv[1], O_RDONLY)) == -1) ++ fperror("open of core"); ++ ++ myread(fd, &elf, sizeof(elf)); ++ ++ if (memcmp(ELFMAG, elf.e_ident, SELFMAG) != 0) ++ printf("bad magic\n"); ++ ++ if (elf.e_ident[EI_CLASS] != ELFCLASS32) ++ printf("wrong class\n"); ++ ++ if (elf.e_ident[EI_DATA] != ELFDATA2LSB) ++ printf("wrong endianess\n"); ++ ++ if (elf.e_ident[EI_VERSION] != EV_CURRENT) ++ printf("wrong version\n"); ++ ++ { ++ const char *str; ++ switch(elf.e_type) ++ { ++#define C(x) case ET_##x: str = #x; break; ++ C(NONE); ++ C(REL); ++ C(EXEC); ++ C(DYN); ++ C(CORE); ++#undef C ++ default: str = "???"; break; ++ } ++ printf("elf file type ET_%s\n", str); ++ } ++ ++ if (elf.e_machine != EM_386 && elf.e_machine != EM_486) ++ printf("not i386 or i486\n"); ++ ++ if (elf.e_ehsize != sizeof(elf)) ++ printf("wrong header size\n"); ++ ++ if (elf.e_phentsize != sizeof(Elf32_Phdr)) ++ printf("wrong phdr size\n"); ++ ++ if (lseek(fd, elf.e_phoff, SEEK_SET) != (off_t)elf.e_phoff) ++ fperror("lseek to phdr failed\n"); ++ ++ for(i = 0; i < elf.e_phnum; i++) ++ { ++ Elf32_Phdr phdr; ++ const char *str; ++ ++ myread(fd, &phdr, sizeof(phdr)); ++ switch(phdr.p_type) ++ { ++#define C(x) case PT_##x: str = #x; break; ++ C(NULL); ++ C(LOAD); ++ C(DYNAMIC); ++ C(INTERP); ++ C(NOTE); ++ C(SHLIB); ++ C(PHDR); ++#undef C ++ default: ++ str = "???"; break; ++ } ++ printf("type PT_%s off=%ld vaddr=%lx filesz=%ld flags=%lx\n", ++ str, phdr.p_offset, phdr.p_vaddr, phdr.p_filesz, ++ (unsigned long)phdr.p_flags); ++ if (phdr.p_type == PT_NOTE) ++ do_note(fd, &phdr); ++ } ++ exit(0); ++} ++ ++++++ file-5.12.tar.gz -> file-5.13.tar.gz ++++++ ++++ 6197 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit emacs-auctex for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package emacs-auctex for openSUSE:Factory checked in at 2013-03-01 07:17:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-auctex (Old) and /work/SRC/openSUSE:Factory/.emacs-auctex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs-auctex", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-auctex/emacs-auctex.changes 2012-07-24 14:58:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs-auctex.new/emacs-auctex.changes 2013-03-01 07:17:18.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 22 17:08:38 UTC 2013 - werner(a)suse.de + +- Make dinbrief work again + +------------------------------------------------------------------- New: ---- auctex-11.86-dinbrief.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-auctex.spec ++++++ --- /var/tmp/diff_new_pack.GeBUgO/_old 2013-03-01 07:17:19.000000000 +0100 +++ /var/tmp/diff_new_pack.GeBUgO/_new 2013-03-01 07:17:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package emacs-auctex # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,6 +49,7 @@ Url: http://www.gnu.org/software/auctex Patch: auctex-11.86.dif Patch1: auctex-11.85-preview.dif +Patch2: auctex-11.86-dinbrief.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -73,6 +74,7 @@ %setup -n auctex-%{version} %patch %patch1 +%patch2 %build unset ${!LC_*} ++++++ auctex-11.86-dinbrief.dif ++++++ --- style/dinbrief.el +++ style/dinbrief.el 2013-02-22 17:00:33.501443992 +0000 @@ -1,93 +1,143 @@ -;;; dinbrief.el - Special code for LaTeX-Style dinbrief. +;; Copyright (C) 1994, 2013 Free Software Foundation, Inc. -;; Contributed by Werner Fink <tex(a)itap.physik.uni-stuttgart.de> -;; Please direct comments to him. +;; Author: Werner Fink <werner(a)suse.de> +;; Maintainer: auctex-devel(a)gnu.org +;; Keywords: tex + +;; This file is part of AUCTeX. + +;; AUCTeX is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3, or (at your option) +;; any later version. + +;; AUCTeX is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with AUCTeX; see the file COPYING. If not, write to the Free +;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +;; 02110-1301, USA. + +;;; dinbrief.el - Special code for LaTeX class dinbrief. ;;; Commentary: -;; LaTeX-Style: dinbrief.sty -;; Server: rusinfo.rus.uni-stuttgart.de -;; Directory: /pub/soft/tex/macros/latex/contrib/letters +;; LaTeX Class: dinbrief.cls ;;; Code: +(require 'tex) + (TeX-add-style-hook "dinbrief" (function (lambda () + (add-hook 'LaTeX-document-style-hook + 'LaTeX-dinbrief-style) (LaTeX-add-environments - '("letter" LaTeX-recipient-hook)) + '("letter" LaTeX-dinbrief-env-recipient) + "dinquote") (TeX-add-symbols - '("Absender" "Absender: ") - '("Postvermerk" "Postvermerk: ") - '("Datum" "Datum: ") - '("Betreff" "Betreff: ") - '("Behandlungsvermerk" "Behandlungsvermerk: ") - '("Verteiler" "Verteiler: ") - "makelabel" "Retourlabel" - '("Anlagen" "Anlagen: ") - '("Fenster" "Fenster $ja/nein$: ") - '("Retouradresse" "Retouradresse: ") + '("address" "Absender: ") + '("postremark" "Postvermerk: ") + '("date" "Datum: ") + '("subject" "Betreff: ") + '("handling" "Behandlungsvermerk: ") + '("cc" "Verteiler: ") + '("place" "Heutiger Ort: ") + "makelabels" + "nowindowrules" + "windowrules" + "nowindowtics" + "windowtics" + "disabledraftstandard" + "enabledraftstandard" + "centeraddress" + "normaladdress" + '("encl" "Anlagen: ") + '("backaddress" "Retouradresse: ") '("signature" "Unterschrift: ") '("opening" "Anrede: ") - '("closing" "Schlu\"s: "))))) + '("closing" "Schluss: "))))) + +(defmacro LaTeX-dinbrief-insert (&rest args) + "Insert text ignoring active markers." + `(progn (if (TeX-mark-active) (TeX-deactivate-mark)) + (insert ,@args))) + +(defun LaTeX-dinbrief-style () + "Insert some useful packages for writing german letters." + (save-excursion + (goto-char (point-min)) ; insert before \begin{document} + (if (re-search-forward ".begin.document." (point-max) t) + (beginning-of-line 1)) + (open-line 2) + (indent-relative-maybe) + (LaTeX-dinbrief-insert TeX-esc "usepackage" + LaTeX-optop "latin1,utf8" LaTeX-optcl + TeX-grop "inputenc" TeX-grcl) + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "usepackage" + LaTeX-optop "T1" LaTeX-optcl + TeX-grop "fontenc" TeX-grcl) + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "usepackage" + TeX-grop "ngerman" TeX-grcl) + (TeX-run-style-hooks "inputenc") + (TeX-run-style-hooks "fontenc") + (TeX-run-style-hooks "ngerman"))) -(defun LaTeX-recipient-hook (environment) +(defun LaTeX-dinbrief-env-recipient (environment) "Insert ENVIRONMENT and prompt for recipient and address." - (let ((sender (read-string "Absender: " (user-full-name))) - (recipient (read-string "Empf\"anger: ")) - (address (read-string "Anschrift: ")) - (postvermerk (read-string "Postvermerk: ")) - (date (read-string "Datum: " (LaTeX-today))) - (betreff (read-string "Betreff: ")) + (let ( + (sender (LaTeX-dinbrief-sender)) + (recipient (read-string "Empfänger: ")) + (address (LaTeX-dinbrief-recipient)) + (date (read-string "Datum: " (LaTeX-dinbrief-today))) + (postremark (read-string "Postvermerk: ")) + (fenster (read-string "Fenster $ja/nein$: ")) (vermerk (read-string "Behandlungsvermerk: ")) (verteil (read-string "Verteiler: ")) - (anlage (read-string "Anlagen: ")) + (betreff (read-string "Betreff: ")) (opening (read-string "Anrede: ")) - (closing (read-string "Schlu\"s: ")) - (fenster (read-string "Fenster $ja/nein$: ")) + (closing (read-string "Schluss: ")) (signature (read-string "Unterschrift: ")) - ) + (anlage (read-string "Anlagen: "))) - (if (not (zerop (length sender))) - (progn - (insert TeX-esc "Absender" TeX-grop sender TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length postvermerk))) - (progn - (insert TeX-esc "Postvermerk" TeX-grop postvermerk TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length betreff))) - (progn - (insert TeX-esc "Betreff" TeX-grop betreff TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length vermerk))) - (progn - (insert TeX-esc "Behandlungsvermerk" TeX-grop vermerk TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length verteil))) - (progn - (insert TeX-esc "Verteiler" TeX-grop verteil TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length anlage))) - (progn - (insert TeX-esc "Anlagen" TeX-grop anlage TeX-grcl) - (newline-and-indent))) (if (string= fenster "ja") (progn - (insert TeX-esc "Fenster") - (let ((retouradr (read-string "Retouradresse: " (user-full-name)))) + (LaTeX-dinbrief-insert TeX-esc "enabledraftstandard") + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "centeraddress") + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "nowindowrules") + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "windowtics") + (newline-and-indent) + (let ((retouradr (read-string "Retouradresse: " sender))) (newline-and-indent) (if (not (zerop (length retouradr))) (progn - (insert TeX-esc "Retouradresse" TeX-grop retouradr TeX-grcl) - (newline-and-indent)))))) + (if (TeX-mark-active) (TeX-deactivate-mark)) + (LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop retouradr TeX-grcl) + (newline-and-indent))))) + (LaTeX-dinbrief-insert TeX-esc "enabledraftstandard") + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "centeraddress") + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "nowindowrules") + (newline-and-indent) + (LaTeX-dinbrief-insert TeX-esc "windowtics")) + (newline-and-indent) (if (not (zerop (length signature))) (progn - (insert TeX-esc "signature" TeX-grop signature TeX-grcl) + (LaTeX-dinbrief-insert TeX-esc "signature" TeX-grop signature TeX-grcl) (newline-and-indent))) (if (not (zerop (length date))) (progn - (insert TeX-esc "Datum" TeX-grop date TeX-grcl) + (LaTeX-dinbrief-insert TeX-esc "date" TeX-grop date TeX-grcl) (newline-and-indent))) (newline-and-indent) @@ -112,9 +162,30 @@ (progn (newline) (indent-to addr-column)))))))) - (insert "\n") + (LaTeX-dinbrief-insert "\n") (indent-to indentation)) - (insert TeX-esc "opening" + (if (not (zerop (length postremark))) + (progn + (LaTeX-dinbrief-insert TeX-esc "postremark" TeX-grop postremark TeX-grcl) + (newline-and-indent))) + (if (not (zerop (length betreff))) + (progn + (LaTeX-dinbrief-insert TeX-esc "subject" TeX-grop) + (LaTeX-dinbrief-insert betreff TeX-grcl) + (newline-and-indent))) + (if (not (zerop (length vermerk))) + (progn + (LaTeX-dinbrief-insert TeX-esc "handling" TeX-grop vermerk TeX-grcl) + (newline-and-indent))) + (if (not (zerop (length verteil))) + (progn + (LaTeX-dinbrief-insert TeX-esc "cc" TeX-grop verteil TeX-grcl) + (newline-and-indent))) + (if (not (zerop (length anlage))) + (progn + (LaTeX-dinbrief-insert TeX-esc "encl" TeX-grop anlage TeX-grcl) + (newline-and-indent))) + (LaTeX-dinbrief-insert TeX-esc "opening" TeX-grop (if (zerop (length opening)) (concat TeX-esc " ") @@ -123,7 +194,7 @@ (indent-relative-maybe) (save-excursion - (insert "\n" TeX-esc "closing" + (LaTeX-dinbrief-insert "\n" TeX-esc "closing" TeX-grop (if (zerop (length closing)) (concat TeX-esc " ") @@ -131,7 +202,47 @@ TeX-grcl "\n") (indent-relative-maybe)))) -(defun LaTeX-today nil +(defun LaTeX-dinbrief-sender nil + "Read and writes the senders address" + (interactive) + (let ((name (read-string "Absender: " (user-full-name))) + (str (read-string "Meine Strasse: ")) + (ort (read-string "Mein Wohnort: "))) + (if (not (zerop (length name))) + (progn + (goto-char (point-min)) ; insert before \end{document} + (if (re-search-forward ".end.document." (point-max) t) + (beginning-of-line 1)) + (previous-line 1) + (LaTeX-dinbrief-insert TeX-esc "address" TeX-grop name) + (if (not (zerop (length str))) + (progn + (LaTeX-dinbrief-insert " " TeX-esc TeX-esc) + (newline-and-indent) + (LaTeX-dinbrief-insert str))) + (if (not (zerop (length ort))) + (progn + (LaTeX-dinbrief-insert " " TeX-esc "par") + (newline-and-indent) + (LaTeX-dinbrief-insert ort))) + (LaTeX-dinbrief-insert TeX-grcl) + (newline-and-indent) + (concat name ", " str ", " ort))))) + +(defun LaTeX-dinbrief-recipient nil + "Read and returns the recipient address" + (interactive) + (let ((str (read-string "Wohnhaft in Strasse: ")) + (ort (read-string "Aus der Ortschaft: "))) + (if (not (zerop (length str))) + (if (not (zerop (length ort))) + (concat str " " TeX-esc TeX-esc " " ort) + str) + (if (not (zerop (length ort))) + ort)) + )) + +(defun LaTeX-dinbrief-today nil "Return a string representing todays date according to flavor." (interactive) (let ((ctime-string (current-time-string)) @@ -152,12 +263,13 @@ ctime-string) (let ((year (substring ctime-string (match-beginning 3) (match-end 3))) (month (substring ctime-string (match-beginning 1) (match-end 1))) - (day (substring ctime-string (match-beginning 2) (match-end 2)))) + (day (substring ctime-string (match-beginning 2) (match-end 2))) + (place (read-string "Heutiger Ort: "))) (if (assoc month month-alist) (progn (setq month (cdr (assoc month month-alist))) (if (> 2 (length day)) (setq day (concat "0" day))))) - (format "Stuttgart, den %s. %s %s" day month year)))) + (format "%s, den %s. %s %s" place day month year)))) ;;; dinbrief.el ends here ++++++ auctex-11.86.dif ++++++ --- /var/tmp/diff_new_pack.GeBUgO/_old 2013-03-01 07:17:19.000000000 +0100 +++ /var/tmp/diff_new_pack.GeBUgO/_new 2013-03-01 07:17:19.000000000 +0100 @@ -30,294 +30,3 @@ "*Command used to print a file. First `%p' is expanded to the printer name, then ordinary expansion is ---- style/dinbrief.el -+++ style/dinbrief.el 2006-06-29 18:40:59.000000000 +0200 -@@ -2,6 +2,9 @@ - - ;; Contributed by Werner Fink <tex(a)itap.physik.uni-stuttgart.de> - ;; Please direct comments to him. -+;; -+;; Change to new dinbrief.sty -- Werner Fink <werner(a)suse.de> -+;; ... yes, we are identical - - ;;; Commentary: - -@@ -14,80 +17,120 @@ - (TeX-add-style-hook "dinbrief" - (function - (lambda () -+ (add-hook 'LaTeX-document-style-hook -+ 'LaTeX-style-dinbrief) - (LaTeX-add-environments -- '("letter" LaTeX-recipient-hook)) -+ '("letter" LaTeX-recipient-hook) -+ "dinquote") - (TeX-add-symbols -- '("Absender" "Absender: ") -- '("Postvermerk" "Postvermerk: ") -- '("Datum" "Datum: ") -- '("Betreff" "Betreff: ") -- '("Behandlungsvermerk" "Behandlungsvermerk: ") -- '("Verteiler" "Verteiler: ") -- "makelabel" "Retourlabel" -- '("Anlagen" "Anlagen: ") -- '("Fenster" "Fenster $ja/nein$: ") -- '("Retouradresse" "Retouradresse: ") -+ '("address" "Absender: ") -+ '("postremark" "Postvermerk: ") -+ '("date" "Datum: ") -+ '("subject" "Betreff: ") -+ '("handling" "Behandlungsvermerk: ") -+ '("cc" "Verteiler: ") -+ '("place" "Heutiger Ort: ") -+ "makelabels" -+ "nowindowrules" -+ "windowrules" -+ "nowindowtics" -+ "windowtics" -+ "disabledraftstandard" -+ "enabledraftstandard" -+ "centeraddress" -+ "normaladdress" -+ '("encl" "Anlagen: ") -+ '("backaddress" "Retouradresse: ") - '("signature" "Unterschrift: ") - '("opening" "Anrede: ") -- '("closing" "Schlu\"s: "))))) -+ '("closing" "Schluss: "))))) -+ -+(if (string-match "XEmacs" emacs-version) -+ (defun TeX-deactivate-mark () (zmacs-deactivate-region)) -+ (defun TeX-deactivate-mark () (deactivate-mark))) -+ -+(defmacro din-insert (&rest args) -+ "Insert text ignoring active markers." -+ `(progn (if (TeX-mark-active) (TeX-deactivate-mark)) -+ (insert ,@args))) -+ -+(defun LaTeX-style-dinbrief () -+ "Insert some useful packages for writing german letters." -+ (if (equal LaTeX-version "2e") -+ (save-excursion -+ (goto-char (point-min)) ; insert before \begin{document} -+ (if (re-search-forward ".begin.document." (point-max) t) -+ (beginning-of-line 1)) -+ (open-line 2) -+ (indent-relative-maybe) -+ (din-insert TeX-esc "usepackage" -+ LaTeX-optop "latin1" LaTeX-optcl -+ TeX-grop "inputenc" TeX-grcl) -+ (newline-and-indent) -+ (din-insert TeX-esc "usepackage" -+ LaTeX-optop "T1" LaTeX-optcl -+ TeX-grop "fontenc" TeX-grcl) -+ (newline-and-indent) -+ (din-insert TeX-esc "usepackage" -+ TeX-grop "ngerman" TeX-grcl) -+ (newline-and-indent) -+ (din-insert TeX-esc "usepackage" -+ TeX-grop "umlaut" TeX-grcl) -+ (TeX-run-style-hooks "inputenc") -+ (TeX-run-style-hooks "fontenc") -+ (TeX-run-style-hooks "ngerman") -+ (TeX-run-style-hooks "umlaut")))) - - (defun LaTeX-recipient-hook (environment) - "Insert ENVIRONMENT and prompt for recipient and address." -- (let ((sender (read-string "Absender: " (user-full-name))) -- (recipient (read-string "Empf\"anger: ")) -- (address (read-string "Anschrift: ")) -- (postvermerk (read-string "Postvermerk: ")) -+ (let ( -+ (sender (LaTeX-sender)) -+ (recipient (read-string "Empf�nger: ")) -+ (address (LaTeX-recipient)) - (date (read-string "Datum: " (LaTeX-today))) -- (betreff (read-string "Betreff: ")) -+ (postremark (read-string "Postvermerk: ")) -+ (fenster (read-string "Fenster $ja/nein$: ")) - (vermerk (read-string "Behandlungsvermerk: ")) - (verteil (read-string "Verteiler: ")) -- (anlage (read-string "Anlagen: ")) -+ (betreff (read-string "Betreff: ")) - (opening (read-string "Anrede: ")) -- (closing (read-string "Schlu\"s: ")) -- (fenster (read-string "Fenster $ja/nein$: ")) -+ (closing (read-string "Schluss: ")) - (signature (read-string "Unterschrift: ")) -+ (anlage (read-string "Anlagen: ")) - ) - -- (if (not (zerop (length sender))) -- (progn -- (insert TeX-esc "Absender" TeX-grop sender TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length postvermerk))) -- (progn -- (insert TeX-esc "Postvermerk" TeX-grop postvermerk TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length betreff))) -- (progn -- (insert TeX-esc "Betreff" TeX-grop betreff TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length vermerk))) -- (progn -- (insert TeX-esc "Behandlungsvermerk" TeX-grop vermerk TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length verteil))) -- (progn -- (insert TeX-esc "Verteiler" TeX-grop verteil TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length anlage))) -- (progn -- (insert TeX-esc "Anlagen" TeX-grop anlage TeX-grcl) -- (newline-and-indent))) - (if (string= fenster "ja") - (progn -- (insert TeX-esc "Fenster") -- (let ((retouradr (read-string "Retouradresse: " (user-full-name)))) -+ (din-insert TeX-esc "enabledraftstandard") -+ (newline-and-indent) -+ (din-insert TeX-esc "centeraddress") -+ (newline-and-indent) -+ (din-insert TeX-esc "nowindowrules") -+ (newline-and-indent) -+ (din-insert TeX-esc "windowtics") -+ (newline-and-indent) -+ (let ((retouradr (read-string "Retouradresse: " sender))) - (newline-and-indent) - (if (not (zerop (length retouradr))) - (progn -- (insert TeX-esc "Retouradresse" TeX-grop retouradr TeX-grcl) -- (newline-and-indent)))))) -+ (if (TeX-mark-active) (TeX-deactivate-mark)) -+ (din-insert TeX-esc "backaddress" TeX-grop retouradr TeX-grcl) -+ (newline-and-indent))))) -+ (din-insert TeX-esc "enabledraftstandard") -+ (newline-and-indent) -+ (din-insert TeX-esc "centeraddress") -+ (newline-and-indent) -+ (din-insert TeX-esc "nowindowrules") -+ (newline-and-indent) -+ (din-insert TeX-esc "windowtics")) -+ (newline-and-indent) - (if (not (zerop (length signature))) - (progn -- (insert TeX-esc "signature" TeX-grop signature TeX-grcl) -+ (din-insert TeX-esc "signature" TeX-grop signature TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length date))) - (progn -- (insert TeX-esc "Datum" TeX-grop date TeX-grcl) -+ (din-insert TeX-esc "date" TeX-grop date TeX-grcl) - (newline-and-indent))) - (newline-and-indent) - -@@ -112,9 +155,32 @@ - (progn - (newline) - (indent-to addr-column)))))))) -- (insert "\n") -+ (din-insert "\n") - (indent-to indentation)) -- (insert TeX-esc "opening" -+ (if (not (zerop (length postremark))) -+ (progn -+ (din-insert TeX-esc "postremark" TeX-grop postremark TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length betreff))) -+ (progn -+ (din-insert TeX-esc "subject" TeX-grop) -+ (if (equal LaTeX-version "2e") -+ (din-insert TeX-esc "textbf" TeX-grop betreff TeX-grcl TeX-grcl) -+ (din-insert betreff TeX-grcl)) -+ (newline-and-indent))) -+ (if (not (zerop (length vermerk))) -+ (progn -+ (din-insert TeX-esc "handling" TeX-grop vermerk TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length verteil))) -+ (progn -+ (din-insert TeX-esc "cc" TeX-grop verteil TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length anlage))) -+ (progn -+ (din-insert TeX-esc "encl" TeX-grop anlage TeX-grcl) -+ (newline-and-indent))) -+ (din-insert TeX-esc "opening" - TeX-grop - (if (zerop (length opening)) - (concat TeX-esc " ") -@@ -123,7 +189,7 @@ - - (indent-relative-maybe) - (save-excursion -- (insert "\n" TeX-esc "closing" -+ (din-insert "\n" TeX-esc "closing" - TeX-grop - (if (zerop (length closing)) - (concat TeX-esc " ") -@@ -131,6 +197,47 @@ - TeX-grcl "\n") - (indent-relative-maybe)))) - -+(defun LaTeX-sender nil -+ "Read and writes the senders address" -+ (interactive) -+ (let ((name (read-string "Absender: " (user-full-name))) -+ (str (read-string "Meine Strasse: ")) -+ (ort (read-string "Mein Wohnort: "))) -+ (if (not (zerop (length name))) -+ (progn -+ (goto-char (point-min)) ; insert before \end{document} -+ (if (re-search-forward ".end.document." (point-max) t) -+ (beginning-of-line 1)) -+ (previous-line 1) -+ (din-insert TeX-esc "address" TeX-grop name) -+ (if (not (zerop (length str))) -+ (progn -+ (din-insert " " TeX-esc TeX-esc) -+ (newline-and-indent) -+ (din-insert str))) -+ (if (not (zerop (length ort))) -+ (progn -+ (din-insert " " TeX-esc "par") -+ (newline-and-indent) -+ (din-insert ort))) -+ (din-insert TeX-grcl) -+ (newline-and-indent) -+ (concat name ", " str ", " ort))))) -+ -+(defun LaTeX-recipient nil -+ "Read and returns the recipient address" -+ (interactive) -+ (let ((str (read-string "Wohnhaft in Strasse: ")) -+ (ort (read-string "Aus der Ortschaft: "))) -+ (if (not (zerop (length str))) -+ (if (not (zerop (length ort))) -+ (concat str " " TeX-esc TeX-esc " " ort) -+ str) -+ (if (not (zerop (length ort))) -+ ort)) -+ ) -+) -+ - (defun LaTeX-today nil - "Return a string representing todays date according to flavor." - (interactive) -@@ -152,12 +259,13 @@ - ctime-string) - (let ((year (substring ctime-string (match-beginning 3) (match-end 3))) - (month (substring ctime-string (match-beginning 1) (match-end 1))) -- (day (substring ctime-string (match-beginning 2) (match-end 2)))) -+ (day (substring ctime-string (match-beginning 2) (match-end 2))) -+ (place (read-string "Heutiger Ort: "))) - (if (assoc month month-alist) - (progn - (setq month (cdr (assoc month month-alist))) - (if (> 2 (length day)) - (setq day (concat "0" day))))) -- (format "Stuttgart, den %s. %s %s" day month year)))) -+ (format "%s, den %s. %s %s" place day month year)))) - - ;;; dinbrief.el ends here -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit csync2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package csync2 for openSUSE:Factory checked in at 2013-03-01 07:17:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csync2 (Old) and /work/SRC/openSUSE:Factory/.csync2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "csync2", Maintainer is "JShi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/csync2/csync2.changes 2012-06-05 15:29:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.csync2.new/csync2.changes 2013-03-01 07:17:04.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 06:00:00 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csync2.spec ++++++ --- /var/tmp/diff_new_pack.6EJEpV/_old 2013-03-01 07:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.6EJEpV/_new 2013-03-01 07:17:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package csync2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Summary: Cluster synchronization tool -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA Name: csync2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cifs-utils for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package cifs-utils for openSUSE:Factory checked in at 2013-03-01 07:16:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cifs-utils (Old) and /work/SRC/openSUSE:Factory/.cifs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cifs-utils", Maintainer is "SJayaraman(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/cifs-utils/cifs-utils.changes 2013-01-24 15:34:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cifs-utils.new/cifs-utils.changes 2013-03-01 07:16:53.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Feb 26 12:07:11 UTC 2013 - lmuelle(a)suse.com + +- Add cifstab named configuration file to post-12.2 systems; (bnc#804822). +- Really use of the existing cifs init script; (bnc#697218). + +------------------------------------------------------------------- +Wed Feb 21 10:34:55 UTC 2013 - lmuelle(a)suse.com + +- Remove superfluous restart or stop of the cifs service; (bnc#804822). + +------------------------------------------------------------------- @@ -225,0 +237,5 @@ + +------------------------------------------------------------------- +Fri Jan 14 15:22:51 CET 2011 - lmuelle(a)suse.de + +- Move the cifs init script nfs dependencies from Required to Should. New: ---- cifstab ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cifs-utils.spec ++++++ --- /var/tmp/diff_new_pack.g9o74A/_old 2013-03-01 07:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.g9o74A/_new 2013-03-01 07:16:54.000000000 +0100 @@ -24,9 +24,15 @@ Group: System/Filesystems Url: http://www.samba.org/linux-cifs/cifs-utils/ Source: %{name}-%{version}.tar.bz2 +%if "%{_vendor}" == "suse" +%define NET_CFGDIR network +%else +%define NET_CFGDIR network-scripts +%endif Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh +Source4: cifstab Patch: 1a01f7c4b90695211d12291d7a24bec05b1f2922.diff %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd @@ -108,35 +114,47 @@ %{__install} -m 0755 ${RPM_SOURCE_DIR}/mkinitrd_scripts_boot-cifs.sh ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/boot-cifs.sh %{__install} -m 0755 ${RPM_SOURCE_DIR}/mkinitrd_scripts_setup-cifs.sh ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/setup-cifs.sh %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221 +mkdir -p \ + ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d \ + ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba \ + ${RPM_BUILD_ROOT}/%{_sbindir} \ + ${RPM_BUILD_ROOT}/var/run +install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs +install -m 0600 -p ${RPM_SOURCE_DIR}/cifstab ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba/cifstab +ln -s %{_sysconfdir}/init.d/${cifs_init_script} ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs +touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \ + ${RPM_BUILD_ROOT}/var/run/cifs +%endif # Hardlink duplicate files %if 0%{?suse_version} > 1110 %fdupes ${RPM_BUILD_ROOT} %endif -%preun -%if 0%{?suse_version} -%{stop_on_removal cifs} -%else -if [ $1 = 0 ] ; then - test -x /sbin/chkconfig && /sbin/chkconfig --del cifs +%pre +# non SUSE + post-12.2, update, no cifstab, but smbfstab +if [ ! 0%{?suse_version} -lt 1221 -a \ + ${1:-0} -gt 1 -a \ + ! -e /etc/samba/cifstab -a \ + -f /etc/samba/smbfstab ]; then + cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move + chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || : fi -%endif - -exit 0 %post +if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then + test -f /etc/samba/cifstab && \ + mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew + mv /var/adm/backup/etc_samba_smbfstab-move /etc/samba/cifstab + if [ -f /var/adm/backup/etc_samba_smbfs-enabled ]; then + chkconfig -a cifs >/dev/null + rm /var/adm/backup/etc_samba_smbfs-enabled + fi +fi [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup exit 0 %postun -%if 0%{?suse_version} -%{restart_on_update cifs} -%{insserv_cleanup} -%else -if [ "$1" -ge "1" ]; then - %{initdir}/cifs restart >/dev/null -fi -%endif [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup exit 0 @@ -174,6 +192,13 @@ %{_libdir}/%{name}/idmapwb.so %doc %{_mandir}/man8/idmapwb.8.* %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221 +%attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/samba/cifstab +%{_sbindir}/rccifs +%dir %{_sysconfdir}/samba +%ghost %{_localstatedir}/run/cifs +%endif %files devel %defattr(-,root,root) ++++++ cifs.init ++++++ --- /var/tmp/diff_new_pack.g9o74A/_old 2013-03-01 07:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.g9o74A/_new 2013-03-01 07:16:54.000000000 +0100 @@ -26,9 +26,9 @@ ### BEGIN INIT INFO # Provides: cifs # Required-Start: $network $syslog -# Should-Start: nmb +# Should-Start: nfs nmb # Required-Stop: $network $syslog -# Should-Stop: nmb +# Should-Stop: nfs nmb # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Import remote SMB/ CIFS (MS Windows) file systems ++++++ cifstab ++++++ # This file allows you to mount SMB/ CIFS shares during system boot while # hiding passwords to other people than root. Use /etc/fstab for public # available services. You have to specify at least a service name and a mount # point. Current default vfstype is cifs. # # The options are explained in the manual page of mount.cifs. # # service moint-point vfstype options ;//fjall/test /data/test cifs username=tridge,password=foobar -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit calligra for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2013-03-01 07:15:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calligra", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2013-02-18 20:28:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2013-03-01 07:15:51.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Feb 22 23:22:27 UTC 2013 - asterios.dramis(a)gmail.com + +- Update to 2.6.1: + * General: + - Fixes for several different crashes. See for instance bugs kde#314676, + kde#314747 + - Several new or improved icons for different applications. + - General look and feel on Windows improved by hardcoding the theme. + * Filters: + - A new filter for the MOBI ebook format was released with 2.6.1. This + filter was scheduled for 2.6.0 but was withheld because of some bugs that + were discovered late in the release cycle. + - Much improvement in exporting tables in the HTML export filter. + - Fix options in the CSV export dialog (bug kde#314766) +- Removed oxygen-icon-theme build requirement (not needed anymore). +- Recommend kexi-sqlite3-driver for kexi (as the preferred driver). +- Require calligra-words-common for the calligra-words package. + +------------------------------------------------------------------- Old: ---- calligra-2.6.0.tar.bz2 New: ---- calligra-2.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.xvRJIp/_old 2013-03-01 07:15:56.000000000 +0100 +++ /var/tmp/diff_new_pack.xvRJIp/_new 2013-03-01 07:15:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: calligra -Version: 2.6.0 +Version: 2.6.1 Release: 0 Summary: Libraries and Base Files for the KDE Office Suite License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2 @@ -31,9 +31,7 @@ %endif BuildRequires: fdupes BuildRequires: fftw3-devel -%if 0%{?suse_version} > 1140 BuildRequires: freetds-devel -%endif BuildRequires: glew-devel BuildRequires: gsl-devel BuildRequires: java-devel @@ -55,9 +53,7 @@ BuildRequires: libqca2-devel BuildRequires: librcps-devel BuildRequires: libsoprano-devel -%if 0%{?suse_version} > 1140 BuildRequires: libspnav-devel -%endif %if 0%{?suse_version} > 1220 BuildRequires: libvisio-devel %endif @@ -66,13 +62,11 @@ BuildRequires: libwps-devel BuildRequires: marble-devel BuildRequires: mysql-devel +BuildRequires: nepomuk-core-devel BuildRequires: okular-devel %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel %endif -# Needed to copy some icons to the hicolor directory (so they can be used with other icon themes) -BuildRequires: nepomuk-core-devel -BuildRequires: oxygen-icon-theme BuildRequires: postgresql-devel BuildRequires: pstoedit BuildRequires: sqlite-devel @@ -122,6 +116,16 @@ This package contains the base files and libraries for the Suite. +%package author +Summary: Minimalistic Word Processor +License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ +Group: Productivity/Office/Suite +Requires: calligra-words-common = %{version} +%kde4_runtime_requires + +%description author +Author is the minimalistic word processor application of the Calligra Suite. + %package braindump Summary: Mind Mapper Application License: GPL-2.0+ and LGPL-2.1+ @@ -142,7 +146,7 @@ Requires: calligra-krita Requires: calligra-plan Requires: calligra-sheets -Requires: calligra-words +Requires: calligra-words-common # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-devel < %{version} @@ -150,6 +154,15 @@ This package contains the build environment needed to compile Calligra applications. +%package doc +Summary: Documentation of the Calligra Suite +License: GFDL-1.2 +Group: Documentation/HTML +Requires: %{name} = %{version} + +%description doc +Documentation of the Calligra Office Suite applications. + %package flow Summary: Flow Chart Drawing Application License: GPL-2.0+ and LGPL-2.1+ @@ -181,12 +194,12 @@ Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: libktexteditor +Recommends: kexi-sqlite3-driver Suggests: kexi-mssql-driver Suggests: kexi-mysql-driver Suggests: kexi-postgresql-driver Suggests: kexi-spreadsheet-import Suggests: kexi-xbase-driver -Suggests: kexi-sqlite3-driver # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kexi < %{version} %kde4_runtime_requires @@ -238,27 +251,27 @@ This package contains a Spreadsheet-to-Kexi-table import plugin. -%package kexi-xbase-driver -Summary: Database Application - XBase driver +%package kexi-sqlite3-driver +Summary: Database Application - SQLite3 driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite %kde4_runtime_requires -%description kexi-xbase-driver +%description kexi-sqlite3-driver Kexi is the database application of the Calligra Suite. -This package contains Kexi XBase driver. +This package contains Kexi SQLite3 driver. -%package kexi-sqlite3-driver -Summary: Database Application - SQLite3 driver +%package kexi-xbase-driver +Summary: Database Application - XBase driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite %kde4_runtime_requires -%description kexi-sqlite3-driver +%description kexi-xbase-driver Kexi is the database application of the Calligra Suite. -This package contains Kexi SQLite3 driver. +This package contains Kexi XBase driver. %package krita Summary: Image Manipulation Application @@ -329,6 +342,7 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} +Requires: calligra-words-common = %{version} # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kword < %{version} %kde4_runtime_requires @@ -336,16 +350,6 @@ %description words Words is the word processor application of the Calligra Suite. -%package author -Summary: Author word Processor -License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ -Group: Productivity/Office/Suite -Requires: calligra-words-common = %{version} -%kde4_runtime_requires - -%description author -Author is the minimalistic word processor application of the Calligra Suite. - %package words-common Summary: Common files for the Author and Word Processor License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ @@ -354,25 +358,13 @@ %kde4_runtime_requires %description words-common -Common files for the Author and Words Processor applications of the Calligra Suite. - -%package doc -Summary: Documentation of the Calligra Suite -License: GFDL-1.2 -Group: Documentation/HTML -Requires: calligra = %{version} - -%description doc -Documentation of the Calligra Office Suite applications. +Common files for the Author and Words applications of the Calligra Suite. %prep %setup -q %build %cmake_kde4 -d build -- -DBUILD_active=false -cd doc -make -cd .. %make_jobs %install @@ -392,8 +384,8 @@ %create_subdir_filelist -d kexi -v devel %create_subdir_filelist -d krita -v devel %create_subdir_filelist -d plan -v devel -%create_subdir_filelist -d stage -f stage -v devel %create_subdir_filelist -d sheets -v devel +%create_subdir_filelist -d stage -f stage -v devel %create_subdir_filelist -d tools -v devel %create_subdir_filelist -d words -v devel cd .. @@ -413,6 +405,7 @@ %fdupes -s %{buildroot}%{_kde4_iconsdir}/ %fdupes -s %{buildroot}%{_kde4_includedir}/ +%suse_update_desktop_file -r author Qt KDE Office WordProcessor %suse_update_desktop_file -r braindump Qt KDE Office Database %suse_update_desktop_file -r flow Qt KDE Office FlowChart %suse_update_desktop_file -r karbon Qt KDE Graphics VectorGraphics @@ -423,14 +416,13 @@ %suse_update_desktop_file -r stage Qt KDE Office Presentation %suse_update_desktop_file -r sheets Qt KDE Office Spreadsheet %suse_update_desktop_file -r words Qt KDE Office WordProcessor -%suse_update_desktop_file -r author Qt KDE Office WordProcessor %kde_post_install # FIX ERROR: Icon file not installed for authors.desktop -for i in {16,32,48,64}; do +for i in {16,22,32,48,64,128}; do mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps - cp -a %{_kde4_iconsdir}/oxygen/"$i"x"$i"/apps/kword.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/calligraauthor.png; + cp -a %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/calligrawords.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/calligraauthor.png done %post @@ -441,13 +433,9 @@ /sbin/ldconfig /usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : -%post krita -/sbin/ldconfig -/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%post author -p /sbin/ldconfig -%postun krita -/sbin/ldconfig -/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%postun author -p /sbin/ldconfig %post braindump -p /sbin/ldconfig @@ -465,18 +453,26 @@ %postun kexi -p /sbin/ldconfig -%post plan -p /sbin/ldconfig +%post krita +/sbin/ldconfig +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : -%postun plan -p /sbin/ldconfig +%postun krita +/sbin/ldconfig +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : -%post stage -p /sbin/ldconfig +%post plan -p /sbin/ldconfig -%postun stage -p /sbin/ldconfig +%postun plan -p /sbin/ldconfig %post sheets -p /sbin/ldconfig %postun sheets -p /sbin/ldconfig +%post stage -p /sbin/ldconfig + +%postun stage -p /sbin/ldconfig + %post tools -p /sbin/ldconfig %postun tools -p /sbin/ldconfig @@ -489,25 +485,21 @@ %postun words-common -p /sbin/ldconfig -%post author -p /sbin/ldconfig - -%postun author -p /sbin/ldconfig - %files -f filelists/exclude %defattr(-,root,root,-) %doc COPYING COPYING.LIB README -%dir %{_kde4_sharedir}/templates -%dir %{_kde4_sharedir}/templates/.source %dir %{_datadir}/color %dir %{_datadir}/color/icc %dir %{_datadir}/color/icc/pigment %{_datadir}/color/icc/pigment/*.icm +%{_datadir}/mime/packages/msooxml-all.xml +%{_datadir}/mime/packages/calligra_svm.xml %dir %{_kde4_iconsdir}/hicolor/512x512 %dir %{_kde4_iconsdir}/hicolor/512x512/apps %dir %{_kde4_iconsdir}/hicolor/1024x1024 %dir %{_kde4_iconsdir}/hicolor/1024x1024/apps -%{_datadir}/mime/packages/msooxml-all.xml -%{_datadir}/mime/packages/calligra_svm.xml +%dir %{_kde4_sharedir}/templates +%dir %{_kde4_sharedir}/templates/.source %{_kde4_applicationsdir}/calligra.desktop %{_kde4_appsdir}/calligra/ %{_kde4_appsdir}/formulashape/ @@ -538,9 +530,11 @@ %{_kde4_iconsdir}/oxygen/*/actions/x-shape-formula.* %{_kde4_iconsdir}/oxygen/*/actions/x-shape-image.* %{_kde4_iconsdir}/oxygen/*/actions/x-shape-text.* +%{_kde4_libdir}/libcalligradb.so.* %{_kde4_libdir}/libchartshapelib.so.* %{_kde4_libdir}/libflake.so.* %{_kde4_libdir}/libkdchart.so.* +%{_kde4_libdir}/libkdgantt.so.* %{_kde4_libdir}/libkformulalib.so.* %{_kde4_libdir}/libkochart.so.* %{_kde4_libdir}/libkokross.so.* @@ -556,9 +550,7 @@ %{_kde4_libdir}/libmsooxml.so.* %{_kde4_libdir}/libpigmentcms.so.* %{_kde4_libdir}/libtextlayout.so.* -%{_kde4_libdir}/libcalligradb.so.* %{_kde4_libdir}/libvectorimage.so.* -%{_kde4_libdir}/libkdgantt.so.* %{_kde4_modulesdir}/artistictextshape.so %{_kde4_modulesdir}/autocorrect.so %{_kde4_modulesdir}/calligradockers.so @@ -567,6 +559,7 @@ %{_kde4_modulesdir}/chartshape.so %{_kde4_modulesdir}/defaulttools.so %{_kde4_modulesdir}/formulashape.so +%{_kde4_modulesdir}/kodocinfopropspage.so %{_kde4_modulesdir}/kolcmsengine.so %{_kde4_modulesdir}/kopabackgroundtool.so %{_kde4_modulesdir}/koreport_*.so @@ -578,10 +571,9 @@ %{_kde4_modulesdir}/spellcheck.so %{_kde4_modulesdir}/textshape.so %{_kde4_modulesdir}/textvariables.so -%{_kde4_modulesdir}/threedshape.so %{_kde4_modulesdir}/thesaurustool.so +%{_kde4_modulesdir}/threedshape.so %{_kde4_modulesdir}/vectorshape.so -%{_kde4_modulesdir}/kodocinfopropspage.so %{_kde4_modulesdir}/videoshape.so %{_kde4_servicesdir}/artistictextshape.desktop %{_kde4_servicesdir}/autocorrect.desktop @@ -592,6 +584,7 @@ %{_kde4_servicesdir}/formulashape.desktop %{_kde4_servicesdir}/kchartpart.desktop %{_kde4_servicesdir}/kformulapart.desktop +%{_kde4_servicesdir}/kodocinfopropspage.desktop %{_kde4_servicesdir}/kolcmsengine.desktop %{_kde4_servicesdir}/kopabackgroundtool.desktop %{_kde4_servicesdir}/koreport_barcodeplugin.desktop @@ -609,10 +602,10 @@ %{_kde4_servicesdir}/thesaurustool.desktop %{_kde4_servicesdir}/threedshape.desktop %{_kde4_servicesdir}/vectorshape.desktop -%{_kde4_servicesdir}/kodocinfopropspage.desktop %{_kde4_servicesdir}/videoshape.desktop %{_kde4_servicetypesdir}/calligra_application.desktop %{_kde4_servicetypesdir}/calligra_deferred_plugin.desktop +%{_kde4_servicetypesdir}/calligradb_driver.desktop %{_kde4_servicetypesdir}/calligradocker.desktop %{_kde4_servicetypesdir}/calligrapart.desktop %{_kde4_servicetypesdir}/filtereffect.desktop @@ -632,15 +625,16 @@ %{_kde4_servicetypesdir}/scripteventaction.desktop %{_kde4_servicetypesdir}/texteditingplugin.desktop %{_kde4_servicetypesdir}/textvariableplugin.desktop -%{_kde4_servicetypesdir}/calligradb_driver.desktop %files devel -f filelists/devel %defattr(-,root,root,-) %{_kde4_appsdir}/cmake/modules/FindCalligraLibs.cmake %{_kde4_includedir}/* +%{_kde4_libdir}/libcalligradb.so %{_kde4_libdir}/libchartshapelib.so %{_kde4_libdir}/libflake.so %{_kde4_libdir}/libkdchart.so +%{_kde4_libdir}/libkdgantt.so %{_kde4_libdir}/libkformulalib.so %{_kde4_libdir}/libkochart.so %{_kde4_libdir}/libkokross.so @@ -656,9 +650,17 @@ %{_kde4_libdir}/libmsooxml.so %{_kde4_libdir}/libpigmentcms.so %{_kde4_libdir}/libtextlayout.so -%{_kde4_libdir}/libcalligradb.so %{_kde4_libdir}/libvectorimage.so -%{_kde4_libdir}/libkdgantt.so + +%files author +%defattr(-,root,root,-) +%{_kde4_applicationsdir}/author.desktop +%{_kde4_appsdir}/author/ +%{_kde4_bindir}/calligraauthor +%{_kde4_configdir}/authorrc +%{_kde4_iconsdir}/hicolor/*/apps/calligraauthor.* +%{_kde4_libdir}/libkdeinit4_calligraauthor.so +%{_kde4_servicesdir}/authorpart.desktop %files braindump -f filelists/braindump %defattr(-,root,root,-) @@ -666,6 +668,14 @@ %dir %{_kde4_appsdir}/stateshape/ %dir %{_kde4_appsdir}/stateshape/states +%files doc +%defattr(-,root,root,-) +%doc COPYING.DOC +%doc %lang(en) %{_kde4_htmldir}/en/calligra/ +%doc %lang(en) %{_kde4_htmldir}/en/kexi/ +%doc %lang(en) %{_kde4_htmldir}/en/sheets/ +%doc %lang(en) %{_kde4_htmldir}/en/stage/ + %files flow -f filelists/flow %defattr(-,root,root,-) %doc flow/AUTHORS flow/CHANGELOG flow/CHANGES flow/LICENSE flow/NOTES flow/README @@ -679,29 +689,26 @@ %files kexi -f filelists/kexi %defattr(-,root,root,-) %doc kexi/CHANGES kexi/README -%{_kde4_iconsdir}/hicolor/*/apps/calligrakexi.* %dir %{_kde4_servicesdir}/kexi/ %dir %{_kde4_servicesdir}/kformdesigner/ # Included in kexi-*-driver packages -%exclude %{_kde4_modulesdir}/kexi*_sybase*.so -%exclude %{_kde4_servicesdir}/kexi*_sybase*.desktop %exclude %{_kde4_modulesdir}/kexi*_mysql*.so %exclude %{_kde4_servicesdir}/kexi*_mysql*.desktop -%exclude %{_kde4_modulesdir}/kexi*_sqlite3*.so -%exclude %{_kde4_servicesdir}/kexi*_sqlite3*.desktop %exclude %{_kde4_modulesdir}/kexi*_pqxx*.so %exclude %{_kde4_servicesdir}/kexi*_pqxx*.desktop +%exclude %{_kde4_modulesdir}/kexi*_sqlite3*.so +%exclude %{_kde4_servicesdir}/kexi*_sqlite3*.desktop +%exclude %{_kde4_modulesdir}/kexi*_sybase*.so +%exclude %{_kde4_servicesdir}/kexi*_sybase*.desktop %exclude %{_kde4_modulesdir}/kexi*_xbase*.so %exclude %{_kde4_servicesdir}/kexi*_xbase*.desktop -%if 0%{?suse_version} > 1140 %files kexi-mssql-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_sybasedriver.so %{_kde4_modulesdir}/keximigrate_sybase.so %{_kde4_servicesdir}/kexidb_sybasedriver.desktop %{_kde4_servicesdir}/keximigrate_sybase.desktop -%endif %files kexi-mysql-driver %defattr(-,root,root,-) @@ -722,6 +729,12 @@ %{_kde4_modulesdir}/keximigrate_spreadsheet.so %{_kde4_servicesdir}/keximigrate_spreadsheet.desktop +%files kexi-sqlite3-driver +%defattr(-,root,root,-) +%{_kde4_modulesdir}/kexidb_sqlite3_icu.so +%{_kde4_modulesdir}/kexidb_sqlite3driver.so +%{_kde4_servicesdir}/kexidb_sqlite3driver.desktop + %files kexi-xbase-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_xbasedriver.so @@ -729,37 +742,18 @@ %{_kde4_servicesdir}/kexidb_xbasedriver.desktop %{_kde4_servicesdir}/keximigrate_xbase.desktop -%files kexi-sqlite3-driver -%defattr(-,root,root,-) -%{_kde4_modulesdir}/kexidb_sqlite3_icu.so -%{_kde4_modulesdir}/kexidb_sqlite3driver.so -%{_kde4_servicesdir}/kexidb_sqlite3driver.desktop - %files krita -f filelists/krita %defattr(-,root,root,-) %doc krita/AUTHORS krita/README -%{_kde4_bindir}/krita -%{_kde4_modulesdir}/kritapart.so -%{_kde4_libdir}/libkdeinit4_krita.so -%{_kde4_applicationsdir}/krita*.desktop -%{_kde4_appsdir}/krita/ -%{_kde4_modulesdir}/krita*.so -%{_kde4_servicesdir}/krita*.desktop -%{_kde4_servicesdir}/kritarulerassistanttool.desktop -%{_kde4_appsdir}/kritaplugins/ -%{_kde4_servicetypesdir}/krita*.desktop -%{_kde4_configdir}/kritarc -%{_kde4_configdir}/krita*.knsrc -%{_datadir}/color/icc/krita/ -%dir %{_kde4_appsdir}/color-schemes/ -%{_kde4_appsdir}/color-schemes/Krita*.colors -%{_kde4_iconsdir}/hicolor/*/apps/calligrakrita.* +%dir %{_datadir}/color/icc/krita/ +%dir %{_kde4_appsdir}/kritaplugins/ +%dir %{_kde4_appsdir}/kritaplugins/metadataeditor %files plan -f filelists/plan %defattr(-,root,root,-) %doc plan/CHANGELOG plan/TODO plan/examples/ +%dir %{_kde4_modulesdir}/planconvert/ %{_kde4_appsdir}/planwork/ -%{_kde4_modulesdir}/planconvert %files stage -f filelists/stage %defattr(-,root,root,-) @@ -778,56 +772,36 @@ %files tools -f filelists/tools %defattr(-,root,root,-) -%exclude %{_kde4_servicesdir}/krita_kra_thumbnail.desktop + +%files words +%defattr(-,root,root,-) +%{_kde4_applicationsdir}/words.desktop +%{_kde4_appsdir}/words/words.rc +%{_kde4_appsdir}/words/words_readonly.rc +%{_kde4_bindir}/calligrawords +%{_kde4_configdir}/wordsrc +%{_kde4_iconsdir}/hicolor/*/apps/calligrawords.* +%{_kde4_libdir}/libkdeinit4_calligrawords.so %files words-common -f filelists/words %defattr(-,root,root,-) +%exclude %{_kde4_applicationsdir}/author.desktop +%exclude %{_kde4_applicationsdir}/words.desktop %exclude %{_kde4_appsdir}/author %exclude %{_kde4_appsdir}/words/words.rc %exclude %{_kde4_appsdir}/words/words_readonly.rc %exclude %{_kde4_bindir}/calligraauthor %exclude %{_kde4_bindir}/calligrawords +%exclude %{_kde4_configdir}/authorrc +%exclude %{_kde4_configdir}/wordsrc +%exclude %{_kde4_iconsdir}/hicolor/*/apps/calligrawords.* %exclude %{_kde4_libdir}/libkdeinit4_calligrawords.so %exclude %{_kde4_libdir}/libkdeinit4_calligraauthor.so -%exclude %{_kde4_applicationsdir}/author.desktop -%exclude %{_kde4_applicationsdir}/words.desktop -%exclude %{_kde4_iconsdir}/hicolor/*/apps/calligrawords.* -%exclude %{_kde4_configdir}/wordsrc -%exclude %{_kde4_configdir}/authorrc %exclude %{_kde4_servicesdir}/authorpart.desktop -%{_kde4_sharedir}/templates/TextDocument.desktop -%{_kde4_sharedir}/templates/.source/TextDocument.odt %dir %{_kde4_appsdir}/words/ %dir %{_kde4_appsdir}/words/kpartplugins/ %{_kde4_appsdir}/words/kpartplugins/googledocs-words.rc - -%files words -%defattr(-,root,root,-) -%{_kde4_bindir}/calligrawords -%{_kde4_appsdir}/words/words.rc -%{_kde4_appsdir}/words/words_readonly.rc -%{_kde4_libdir}/libkdeinit4_calligrawords.so -%{_kde4_applicationsdir}/words.desktop -%{_kde4_iconsdir}/hicolor/*/apps/calligrawords.* -%{_kde4_configdir}/wordsrc - -%files author -%defattr(-,root,root,-) -%{_kde4_appsdir}/author -%{_kde4_bindir}/calligraauthor -%{_kde4_libdir}/libkdeinit4_calligraauthor.so -%{_kde4_applicationsdir}/author.desktop -%{_kde4_configdir}/authorrc -%{_kde4_iconsdir}/hicolor/*/apps/calligraauthor.* -%{_kde4_configdir}/authorrc -%{_kde4_servicesdir}/authorpart.desktop - -%files doc -%defattr(-,root,root,-) -%doc COPYING.DOC -%doc %lang(en) %{_kde4_htmldir}/en/calligra/ -%doc %lang(en) %{_kde4_htmldir}/en/kexi/ -%doc %lang(en) %{_kde4_htmldir}/en/sheets/ -%doc %lang(en) %{_kde4_htmldir}/en/stage/ +%{_kde4_sharedir}/templates/TextDocument.desktop +%{_kde4_sharedir}/templates/.source/TextDocument.odt %changelog ++++++ calligra-2.6.0.tar.bz2 -> calligra-2.6.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.6.0.tar.bz2 /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.6.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2013-03-01 07:15:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "build", Maintainer is "mls(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2012-12-05 13:47:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2013-03-01 07:15:15.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Feb 27 09:14:05 UTC 2013 - adrian(a)suse.de + +- ARM AArch64 support added +- Generic system emulator support as VM added +- s390 z/VM build environment support added +- support collecting resource statistics during build (for OBS 2.4) +- rpm5 fixes +- kvm support for armv7l +- mount /dev/pts with right permissions + +------------------------------------------------------------------- Old: ---- obs-build-20121123.tar.gz osc New: ---- obs-build-20130227.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-initvm.spec ++++++ --- /var/tmp/diff_new_pack.RBBjIe/_old 2013-03-01 07:15:16.000000000 +0100 +++ /var/tmp/diff_new_pack.RBBjIe/_new 2013-03-01 07:15:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package build-initvm # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 20121123 +Version: 20130227 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.RBBjIe/_old 2013-03-01 07:15:16.000000000 +0100 +++ /var/tmp/diff_new_pack.RBBjIe/_new 2013-03-01 07:15:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package build # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20121123 +Version: 20130227 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.RBBjIe/_old 2013-03-01 07:15:16.000000000 +0100 +++ /var/tmp/diff_new_pack.RBBjIe/_new 2013-03-01 07:15:16.000000000 +0100 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20121123 +pkgver=20130227 pkgrel=1 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ groups=('base-devel') depends=('perl') source=(obs-build-${pkgver}.tar.gz) -md5sums=('2c66ccbe77cedb3f15d20816d6715440') +md5sums=('3db9a882f3c7c57c0a89833230324c66') package() { msg "Installing build ..." ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.RBBjIe/_old 2013-03-01 07:15:16.000000000 +0100 +++ /var/tmp/diff_new_pack.RBBjIe/_new 2013-03-01 07:15:16.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20121123 +Version: 20130227 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++ obs-build-20121123.tar.gz -> obs-build-20130227.tar.gz ++++++ ++++ 1677 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit boost for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package boost for openSUSE:Factory checked in at 2013-03-01 07:14:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/boost (Old) and /work/SRC/openSUSE:Factory/.boost.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "boost", Maintainer is "pth(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/boost/boost.changes 2013-01-30 09:29:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.boost.new/boost.changes 2013-03-01 07:14:40.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 27 18:34:09 UTC 2013 - dmueller(a)suse.com + +- build without openmpi on aarch64 for now + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boost.spec ++++++ --- /var/tmp/diff_new_pack.iCBwiO/_old 2013-03-01 07:14:42.000000000 +0100 +++ /var/tmp/diff_new_pack.iCBwiO/_new 2013-03-01 07:14:42.000000000 +0100 @@ -31,7 +31,7 @@ # Just hardcode build_mpi to 1 as soon as openmpi builds on all # named architectures. -%ifarch s390 s390x ia64 hppa +%ifarch s390 s390x ia64 hppa aarch64 %define build_mpi 0 %else %define build_mpi 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2013-03-01 07:13:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluez", Maintainer is "ACho(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez/bluez-gstreamer.changes 2013-01-22 14:59:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez-gstreamer.changes 2013-03-01 07:13:37.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Feb 28 14:45:10 UTC 2013 - seife+obs(a)b1-systems.com + +- add bluez-4.101-new-automake.diff, fix build with automake-1.13.1 + +------------------------------------------------------------------- +Fri Jan 25 08:05:27 UTC 2013 - seife+obs(a)b1-systems.com + +- also run spec-cleaner on bluez-gstreamer.spec, add README for + packagers, fix bluez-gstreamer changelog + +------------------------------------------------------------------- +Mon Jan 21 11:16:34 UTC 2013 - dimstar(a)opensuse.org + +- Unconditionally enable the systemd bluetooth service (actual + activation of bluez is triggered by udev) (bnc#796671). +- Run spec-cleaner. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2013-01-29 10:27:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2013-03-01 07:13:37.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 28 14:45:10 UTC 2013 - seife+obs(a)b1-systems.com + +- add bluez-4.101-new-automake.diff, fix build with automake-1.13.1 + +------------------------------------------------------------------- +Fri Jan 25 08:05:27 UTC 2013 - seife+obs(a)b1-systems.com + +- also run spec-cleaner on bluez-gstreamer.spec, add README for + packagers, fix bluez-gstreamer changelog + +------------------------------------------------------------------- New: ---- README.packagers bluez-4.101-new-automake.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.x2JcLe/_old 2013-03-01 07:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.x2JcLe/_new 2013-03-01 07:13:38.000000000 +0100 @@ -18,17 +18,27 @@ Name: bluez-gstreamer -BuildRequires: dbus-1-devel >= 1.4 BuildRequires: flex BuildRequires: libcap-ng-devel +BuildRequires: pkgconfig(dbus-1) >= 1.4 %if 0%{?suse_version} > 1130 BuildRequires: pkgconfig(systemd) %endif +Version: 4.101 +Release: 0 +Summary: Bluetooth Sound Support +License: GPL-2.0+ +Group: Productivity/Multimedia/Sound/Utilities +Url: http://www.bluez.org +Source: bluez-%{version}.tar.bz2 +Source3: bluetooth.sysconfig +Source6: README.SUSE +Source99: README.packagers +# fix for new automake, will not go upstream (upstream is at bluez-5) +Patch1: bluez-4.101-new-automake.diff BuildRequires: alsa-devel BuildRequires: automake BuildRequires: check-devel -BuildRequires: glib2-devel >= 2.28 -BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libsndfile-devel BuildRequires: libtool @@ -37,19 +47,12 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: udev +BuildRequires: pkgconfig(glib-2.0) >= 2.28 +BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(libnl-1) -Url: http://www.bluez.org -Version: 4.101 -Release: 0 -Summary: Bluetooth Sound Support -License: GPL-2.0+ -Group: Productivity/Multimedia/Sound/Utilities -Source: bluez-%{version}.tar.bz2 -Source3: bluetooth.sysconfig -Source6: README.SUSE -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libbluetooth3 = %{version} -Provides: bluez-audio:%_libdir/gstreamer-0.10/libgstbluetooth.so +Provides: bluez-audio:%{_libdir}/gstreamer-0.10/libgstbluetooth.so +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %( echo `rpm -q --queryformat %%{version} udev` ) < 144 %define OLD_UDEV 1 %else @@ -61,16 +64,10 @@ The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - -Authors: --------- - Marcel Holtmann <marcel(a)holtmann.org> - and others, see AUTHORS in the documentation of the "bluez" package. - %prep %setup -n bluez-%{version} -q -cp %{S:6} . +%patch1 -p1 +cp %{SOURCE6} . %build autoreconf -fiv @@ -94,14 +91,14 @@ make %{?_smp_mflags} all V=1 %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/usr/[^l]* $RPM_BUILD_ROOT/[^u]* $RPM_BUILD_ROOT/%{_libdir}/[^g]* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}/*bluetooth* $RPM_BUILD_ROOT/usr/include -rm -rf $RPM_BUILD_ROOT/usr/lib/udev $RPM_BUILD_ROOT/usr/lib/systemd -rm $RPM_BUILD_ROOT/%{_libdir}/*/*.la +%make_install +rm -rf %{buildroot}%{_prefix}/[^l]* %{buildroot}/[^u]* %{buildroot}/%{_libdir}/[^g]* +rm -rf %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/%{_libdir}/*bluetooth* %{buildroot}%{_prefix}/include +rm -rf %{buildroot}%{_prefix}/lib/udev %{buildroot}%{_prefix}/lib/systemd +rm %{buildroot}/%{_libdir}/*/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-, root, root) ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.x2JcLe/_old 2013-03-01 07:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.x2JcLe/_new 2013-03-01 07:13:38.000000000 +0100 @@ -38,8 +38,11 @@ Source5: baselibs.conf Source6: README.SUSE Source7: bluetooth.modprobe +Source99: README.packagers # already fixed upstream Patch0: 0001-network-fix-network-Connect-method-parameters.patch +# fix for new automake, will not go upstream (upstream is at bluez-5) +Patch1: bluez-4.101-new-automake.diff BuildRequires: alsa-devel BuildRequires: automake BuildRequires: check-devel @@ -149,6 +152,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE6} . mkdir dbus-apis cp -a doc/*.txt dbus-apis/ ++++++ README.packagers ++++++ Hi all, bluez and bluez-gstreamer are just split in order to avoid cyclic build dependencies. If you are changing bluez.spec, consider also adapting bluez-gstreamer.spec so that the diff remains more or less the same. Especially, bluez-gstreamer.changes should always be identical to bluez.changes. Thanks for considering :-) seife ++++++ bluez-4.101-new-automake.diff ++++++ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.60) AC_INIT(bluez, 4.101) AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bison for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package bison for openSUSE:Factory checked in at 2013-03-01 07:12:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bison (Old) and /work/SRC/openSUSE:Factory/.bison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bison", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bison/bison.changes 2012-11-17 07:20:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bison.new/bison.changes 2013-03-01 07:12:44.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 6 06:11:30 UTC 2013 - adrian(a)suse.com + +- bison update to 2.7 + * Changes in the format of error messages + * New format for error reports: carets + * New value for %define variable: api.pure full + * New %define variable: api.location.type (glr.cc, lalr1.cc, lalr1.java) + * Exception safety (lalr1.cc) + * Graph improvements in DOT and XSLT + * %language is no longer an experimental feature. + +------------------------------------------------------------------- Old: ---- bison-2.6.5.tar.xz New: ---- bison-2.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bison.spec ++++++ --- /var/tmp/diff_new_pack.hNsmRA/_old 2013-03-01 07:12:45.000000000 +0100 +++ /var/tmp/diff_new_pack.hNsmRA/_new 2013-03-01 07:12:45.000000000 +0100 @@ -18,13 +18,13 @@ Name: bison BuildRequires: gcc-c++ -BuildRequires: xz +BuildRequires: xz flex Requires(pre): %install_info_prereq # bug437293 %ifarch ppc64 Obsoletes: bison-64bit %endif -Version: 2.6.5 +Version: 2.7 Release: 0 Summary: The GNU Parser Generator License: GPL-3.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0