October 2012 - openSUSE Commits - openSUSE Mailing Lists

commit fonts-config for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package fonts-config for openSUSE:Factory checked in at 2012-10-03 07:13:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fonts-config (Old) and /work/SRC/openSUSE:Factory/.fonts-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fonts-config", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes 2012-09-20 16:00:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes 2012-10-03 07:13:38.000000000 +0200 @@ -7,0 +8,5 @@ +Fri Sep 14 08:00:41 UTC 2012 - pgajdos(a)suse.com + +- cooperate with fontconfig 2.10.0 (removed /etc/fonts/conf.avail) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonts-config.spec ++++++ --- /var/tmp/diff_new_pack.5cbQEJ/_old 2012-10-03 07:13:40.000000000 +0200 +++ /var/tmp/diff_new_pack.5cbQEJ/_new 2012-10-03 07:13:40.000000000 +0200 @@ -66,15 +66,16 @@ install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \ %{buildroot}%{_localstatedir}/adm/fillup-templates/ # -mkdir -p %{buildroot}%{_fontsconfddir} -mkdir -p %{buildroot}%{_fontsconfavaildir} +mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/ sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \ - > %{buildroot}%{_fontsconfavaildir}/12-suse-hinting-bc.conf + > %{buildroot}%{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \ - > %{buildroot}%{_fontsconfavaildir}/17-suse-bitmaps.conf -ln -s ../conf.avail/12-suse-hinting-bc.conf \ + > %{buildroot}%{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf +# +mkdir -p %{buildroot}%{_fontsconfddir} +ln -s %{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf \ %{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf -ln -s ../conf.avail/17-suse-bitmaps.conf \ +ln -s %{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf \ %{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf %post @@ -89,7 +90,8 @@ %{_datadir}/fonts-config/* %{_mandir}/man1/fonts-config.1.gz %{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config -%{_fontsconfavaildir}/* +%dir %{_datadir}/%{name}/conf.avail +%{_datadir}/%{name}/conf.avail/*.conf %{_fontsconfddir}/* %changelog ++++++ fonts-config ++++++ --- /var/tmp/diff_new_pack.5cbQEJ/_old 2012-10-03 07:13:40.000000000 +0200 +++ /var/tmp/diff_new_pack.5cbQEJ/_new 2012-10-03 07:13:40.000000000 +0200 @@ -2275,7 +2275,7 @@ } ######################################################################## sub hinting_setup { - my $suse_hinting_file = "/etc/fonts/conf.avail/12-suse-hinting-bc.conf"; + my $suse_hinting_file = "/usr/share/fonts-config/conf.avail/12-suse-hinting-bc.conf"; my $suse_hinting_template_file = "/usr/share/fonts-config/suse-hinting.conf.template"; my $suse_hinting = ""; my $suse_hinting_template = ""; @@ -2311,7 +2311,7 @@ ######################################################################## sub embedded_bitmap_setup { - my $suse_bitmaps_file = "/etc/fonts/conf.avail/17-suse-bitmaps.conf"; + my $suse_bitmaps_file = "/usr/share/fonts-config/conf.avail/17-suse-bitmaps.conf"; my $suse_bitmaps_template_file = "/usr/share/fonts-config/suse-bitmaps.conf.template"; my $suse_bitmaps = ""; my $suse_bitmaps_template = ""; @@ -2342,17 +2342,13 @@ $suse_bitmaps_template .= " <bool>false</bool>\n"; $suse_bitmaps_template .= " </edit>\n"; $suse_bitmaps_template .= " </match>\n"; - $suse_bitmaps_template .= " <match target=\"font\">\n"; - $suse_bitmaps_template .= " <test name=\"lang\" compare=\"contains\">\n"; my @languages = split (":", "$OPT_EBITMAP_LANG"); for my $i (@languages) { - $suse_bitmaps_template .= " <string>$i</string>\n"; + $suse_bitmaps_template .= " <match target=\"font\">\n"; + $suse_bitmaps_template .= " <test name=\"lang\" compare=\"contains\"><string>$i</string></test>\n"; + $suse_bitmaps_template .= " <edit name=\"embeddedbitmap\" mode=\"assign\"><bool>true</bool></edit>\n"; + $suse_bitmaps_template .= " </match>\n"; } - $suse_bitmaps_template .= " </test>\n"; - $suse_bitmaps_template .= " <edit name=\"embeddedbitmap\" mode=\"assign\">\n"; - $suse_bitmaps_template .= " <bool>true</bool>\n"; - $suse_bitmaps_template .= " </edit>\n"; - $suse_bitmaps_template .= " </match>\n"; } } } ++++++ suse-hinting.conf.template ++++++ --- /var/tmp/diff_new_pack.5cbQEJ/_old 2012-10-03 07:13:40.000000000 +0200 +++ /var/tmp/diff_new_pack.5cbQEJ/_new 2012-10-03 07:13:40.000000000 +0200 @@ -26,38 +26,131 @@ and like a bitmap look and feel. --> <match target="font"> - <test name="family"> - <string>Andale Mono</string> - <string>Arial</string> - <string>Comic Sans MS</string> - <string>Georgia</string> - <string>Impact</string> - <string>Trebuchet MS</string> - <string>Verdana</string> - <string>Courier New</string> - <string>Times New Roman</string> - <string>Tahoma</string> - <string>Webdings</string> - <string>Albany AMT</string> - <string>Thorndale AMT</string> - <string>Cumberland AMT</string> - <string>Andale Sans</string> - <string>Andy MT</string> - <string>Bell MT</string> - <string>Monotype Sorts</string> - <string>Lucida Sans Typewriter</string> - <string>Lucida Sans</string> - <string>Lucida Bright</string> - </test> - <test name="pixelsize" compare="less_eq"> - <double>_BYTECODE_BW_MAX_PIXEL_</double> - </test> - <edit name="autohint"> - <bool>false</bool> - </edit> - <edit name="antialias"> - <bool>false</bool> - </edit> + <test name="family"><string>Andale Mono</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Arial</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + + <match target="font"> + <test name="family"><string>Comic Sans MS</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Georgia</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Impact</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Trebuchet MS</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Verdana</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Courier New</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Times New Roman</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Tahoma</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Webdings</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Albany AMT</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Thorndale AMT</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Cumberland AMT</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Andale Sans</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Andy MT</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Bell MT</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Monotype Sorts</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Lucida Sans Typewriter</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Lucida Sans</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>Lucida Bright</string></test> + <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test> + <edit name="autohint"><bool>false</bool></edit> + <edit name="antialias"><bool>false</bool></edit> </match> </fontconfig> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fontconfig for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package fontconfig for openSUSE:Factory checked in at 2012-10-03 07:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontconfig (Old) and /work/SRC/openSUSE:Factory/.fontconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontconfig", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/fontconfig/fontconfig.changes 2012-09-17 13:55:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontconfig.new/fontconfig.changes 2012-10-03 07:13:11.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Sep 24 10:03:29 UTC 2012 - pgajdos(a)suse.com + +- turn off autohinter for Verdana again, which implies using BCI + with hintstyle=3 [bnc#737215], [bnc#781631] + +------------------------------------------------------------------- +Thu Sep 13 15:03:10 UTC 2012 - pgajdos(a)suse.com + +- updated to 2.10.0: + * /etc/fonts/conf.avail is deprecated and is packaged only + for compatibility reasons; package should install its *.conf + files in its data dir and link it into /etc/fonts/conf.d as + usual + * introduced warning -- <alias> should not contain more <family>s + * introduced warning -- <test> should not contain more values + * introduced warning -- reading configurations from ~/.fonts.conf + is deprecated; move ~/.fonts.conf into $XDG_CONFIG_HOME/fontconfig/fonts.conf + (the same for ~/.fonts.conf.d, see + http://freedesktop.org/software/fontconfig/fontconfig-user.html) + +------------------------------------------------------------------- Old: ---- fontconfig-2.9.0.tar.bz2 fontconfig-doc-2.9.0.tar.bz2 simsun-conf.patch suse-generic-names.conf suse-post-user.conf suse-pre-user.conf New: ---- 50-suse-pre-user.conf 58-suse-post-user.conf fontconfig-2.10.0.tar.bz2 fontconfig-doc-2.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.4RqS9Q/_old 2012-10-03 07:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.4RqS9Q/_new 2012-10-03 07:13:13.000000000 +0200 @@ -16,8 +16,9 @@ # -Name: fontconfig %define build_docs 0 + +Name: fontconfig BuildRequires: automake BuildRequires: freetype2-devel BuildRequires: libexpat-devel @@ -39,14 +40,14 @@ BuildRequires: perl-SGMLS BuildRequires: sgml-skel %endif -Provides: XFree86:/etc/fonts/fonts.dtd +Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd Url: http://fontconfig.org/ # bug437293 %ifarch ppc64 Obsoletes: fontconfig-64bit %endif Requires: bash -Version: 2.9.0 +Version: 2.10.0 Release: 0 Summary: Library for Font Configuration License: MIT @@ -58,25 +59,22 @@ Source2: iso639-1 Source3: iso639-2 Source4: baselibs.conf -Source10: suse-generic-names.conf -Source11: suse-pre-user.conf -Source12: suse-post-user.conf -Source13: 11-suse-hinting.conf -Source14: 16-suse-hintstyle.conf -Source15: 18-suse-bitmaps-misc.conf -Source16: local.conf -Source20: local.conf.instsys -# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703 -Patch0: simsun-conf.patch +Source8: local.conf +Source9: local.conf.instsys +Source11: 11-suse-hinting.conf +Source16: 16-suse-hintstyle.conf +Source18: 18-suse-bitmaps-misc.conf +Source50: 50-suse-pre-user.conf +Source58: 58-suse-post-user.conf # suse specific because freetype2-bitmap-foundry.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 -Patch1: make-check.patch +Patch0: make-check.patch # suse specific -Patch2: usr-share-doc-packages.patch +Patch1: usr-share-doc-packages.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705 -Patch3: cloexec.patch +Patch2: cloexec.patch # to be upstreamed -Patch4: metric-croscore.patch +Patch3: metric-croscore.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config <= 003.02 @@ -119,11 +117,10 @@ %if %{build_docs} < 1 tar -xvf %{SOURCE1} %endif -%patch0 -p1 -b .fonts.conf +%patch0 -p1 %patch1 -p1 -%patch2 -p1 +%patch2 %patch3 -%patch4 %build autoreconf -fiv @@ -132,7 +129,7 @@ --with-freetype-lib=%_libdir \ --with-x \ --enable-libxml2=no \ - --with-confdir=/etc/fonts \ + --with-confdir=%{_sysconfdir}/fonts \ --with-docdir=%{_defaultdocdir}/%{name} \ --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ %if %{build_docs} == 0 @@ -147,46 +144,42 @@ unset MALLOC_CHECK_ %install -make DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig install -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel +make DESTDIR=%{buildroot} pkgconfigdir=%{_libdir}/pkgconfig install +rm -f %{buildroot}%{_libdir}/*.la +# package /etc/fonts/conf.avail for compatibility reasons +mkdir %{buildroot}%{_sysconfdir}/fonts/conf.avail +# documentation +mkdir -p %{buildroot}/%{_defaultdocdir}/fontconfig +mkdir -p %{buildroot}/%{_defaultdocdir}/fontconfig-devel install -m 644 AUTHORS COPYING ChangeLog README $RPM_SOURCE_DIR/iso639-? \ - $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -install -m 644 doc/*.html $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig -install -m 644 doc/fontconfig-user.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig -install -m 644 doc/fontconfig-devel/* $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel -install -m 644 doc/fontconfig-devel.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel + %{buildroot}/%{_defaultdocdir}/%{name} +install -m 644 doc/*.html %{buildroot}/%{_defaultdocdir}/fontconfig +install -m 644 doc/fontconfig-user.txt %{buildroot}/%{_defaultdocdir}/fontconfig +install -m 644 doc/fontconfig-devel/* %{buildroot}/%{_defaultdocdir}/fontconfig-devel +install -m 644 doc/fontconfig-devel.txt %{buildroot}/%{_defaultdocdir}/fontconfig-devel for i in 1 3 5 do - mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man${i}/ + mkdir -p %{buildroot}/%{_mandir}/man${i}/ for j in fc-*/*.${i} doc/*.${i} doc/*/*.${i} do - test -f ${j} && install -m 644 ${j} $RPM_BUILD_ROOT/%{_mandir}/man${i}/ + test -f ${j} && install -m 644 ${j} %{buildroot}/%{_mandir}/man${i}/ done - gzip --best $RPM_BUILD_ROOT/%{_mandir}/man${i}/*.${i} + gzip --best %{buildroot}/%{_mandir}/man${i}/*.${i} done -# install the conf.d README as well, I think it's helpful: -install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d -install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ +install -m 644 conf.d/README %{buildroot}%{_sysconfdir}/fonts/conf.d +# tune links in conf.d +pushd %{buildroot}%{_sysconfdir}/fonts/conf.d + mv 50-user.conf 56-user.conf + mv 51-local.conf 55-local.conf + rm -f 51-local.conf +popd for i in $RPM_SOURCE_DIR/[0-9]*.conf; do j=${i##*/} - install -m 644 $i $RPM_BUILD_ROOT/etc/fonts/conf.avail/ - ln -s ../conf.avail/$j $RPM_BUILD_ROOT/etc/fonts/conf.d/$j + install -m 644 $i %{buildroot}%{_datadir}/%{name}/conf.avail/ + ln -s ../../..%{_datadir}/%{name}/conf.avail/$j %{buildroot}%{_sysconfdir}/fonts/conf.d/$j done -install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts -install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ -# tune links in conf.d: -pushd $RPM_BUILD_ROOT/etc/fonts/conf.d - rm -f 50-user.conf - rm -f 51-local.conf - ln -s ../suse-pre-user.conf 50-suse-pre-user.conf - ln -s ../conf.avail/51-local.conf 55-local.conf - ln -s ../conf.avail/50-user.conf 56-user.conf - ln -s ../suse-post-user.conf 58-suse-post-user.conf -popd -# don't package any files in the cache directory, only the directory itself: -rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/* -rm -f %{buildroot}%{_libdir}/*.la +install -m 644 $RPM_SOURCE_DIR/local.conf %{buildroot}%{_sysconfdir}/fonts +install -m 644 $RPM_SOURCE_DIR/local.conf.instsys %{buildroot}%{_sysconfdir}/fonts/ %post -p /sbin/ldconfig @@ -194,25 +187,26 @@ %files %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name} -%{_bindir}/* -%dir /etc/fonts -%config /etc/fonts/fonts.dtd -%config /etc/fonts/fonts.conf -%config /etc/fonts/suse-generic-names.conf -%config /etc/fonts/suse-pre-user.conf -%config /etc/fonts/suse-post-user.conf -%dir /etc/fonts/conf.avail/ -/etc/fonts/conf.avail/* -%dir /etc/fonts/conf.d/ -/etc/fonts/conf.d/README -%config(noreplace) /etc/fonts/conf.d/*.conf -%config(noreplace) /etc/fonts/local.conf -%config /etc/fonts/local.conf.instsys %{_libdir}/libfontconfig.so.* +%{_bindir}/* +%dir %{_sysconfdir}/fonts +%dir %{_sysconfdir}/fonts/conf.d +# packaging /etc/fonts/conf.avail for compatibility reasons +%dir %{_sysconfdir}/fonts/conf.avail +%config %{_sysconfdir}/fonts/fonts.conf +%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/fonts/local.conf +%config %{_sysconfdir}/fonts/local.conf.instsys +%{_sysconfdir}/fonts/conf.d/README +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/conf.avail +%{_datadir}/%{name}/conf.avail/*.conf +%dir %{_datadir}/xml/%{name} +%{_datadir}/xml/%{name}/fonts.dtd +%dir /var/cache/fontconfig/ +%doc %{_docdir}/%{name} %{_mandir}/man5/fonts-conf.5.gz %{_mandir}/man1/* -%dir /var/cache/fontconfig/ %files devel %defattr(-,root,root) ++++++ 11-suse-hinting.conf ++++++ --- /var/tmp/diff_new_pack.4RqS9Q/_old 2012-10-03 07:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.4RqS9Q/_new 2012-10-03 07:13:13.000000000 +0200 @@ -106,92 +106,305 @@ --> <match target="font"> - <test name="fontformat"> - <string>TrueType</string> - </test> - <test name="family"> - <string>Verdana</string> - <string>MS Gothic</string> - <string>MS PGothic</string> - <string>MS UI Gothic</string> - <string>MS Mincho</string> - <string>MS PMincho</string> - <string>HGPSoeiKakupoptai</string> - <string>HGSGothicE</string> - <string>HGSGothicM</string> - <string>HGKyokashotai</string> - <string>HGSSoeiKakugothicUB</string> - <string>HGPGothicB</string> - <string>HGPGothicE</string> - <string>HGPGothicM</string> - <string>HGSKyokashotai</string> - <string>HGMaruGothicMPRO</string> - <string>HGPSoeiKakugothicUB</string> - <string>HGMinchoL</string> - <string>HGPMinchoL</string> - <string>HGMinchoB</string> - <string>HGPMinchoB</string> - <string>HGSMinchoB</string> - <string>HGMinchoE</string> - <string>HGPMinchoE</string> - <string>HGSMinchoE</string> - <string>HGSoeiKakugothicUB</string> - <string>HGGyoshotai</string> - <string>HGPGyoshotai</string> - <string>HGSGyoshotai</string> - <string>HGSoeiKakupoptai</string> - <string>HGSSoeiPresenceEB</string> - <string>HGPSoeiPresenceEB</string> - <string>HGGothicB</string> - <string>HGGothicE</string> - <string>HGGothicM</string> - <string>HGSoeiPresenceEB</string> - <string>HGPKyokashotai</string> - <string>HGSSoeiKakupoptai</string> - <string>HGSeikaishotaiPRO</string> - <string>TLKyokashotai</string> - <string>TLMincho</string> - <string>TLPMincho</string> - <string>TLPGothic</string> - <string>TLPKyokashotai</string> - <string>TLMarugothicM</string> - <string>TLGyoshotai</string> - <string>TLPGyoshotai</string> - <string>TLSGyoshotai</string> - <string>TLPMarugothicM</string> - <string>TLSMarugothicM</string> - <string>TLSKyokashotai</string> - <string>TLGothic</string> - <string>UnBatangBold</string> - <string>UnBatang</string> - <string>UnBom</string> - <string>UnDinaruBold</string> - <string>UnDinaruLight</string> - <string>UnDinaru</string> - <string>UnDotumBold</string> - <string>UnDotum</string> - <string>UnGraphicBold</string> - <string>UnGraphic</string> - <string>UnGungseo</string> - <string>UnJamoBatang</string> - <string>UnJamoDotum</string> - <string>UnJamoNovel</string> - <string>UnJamoSora</string> - <string>UnPenheulim</string> - <string>UnPen</string> - <string>UnPilgia</string> - <string>UnPilgiBold</string> - <string>UnPilgi</string> - <string>UnShinmun</string> - <string>UnTaza</string> - <string>UnVada</string> - <string>UnYetgul</string> - </test> - <edit name="autohint"> - <bool>true</bool> - </edit> + <test name="family"><string>MS Gothic</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>MS PGothic</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>MS UI Gothic</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>MS Mincho</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>MS PMincho</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPSoeiKakupoptai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSGothicE</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSGothicM</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGKyokashotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSSoeiKakugothicUB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPGothicB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPGothicE</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPGothicM</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSKyokashotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGMaruGothicMPRO</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPSoeiKakugothicUB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGMinchoL</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPMinchoL</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGMinchoB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPMinchoB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSMinchoB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGMinchoE</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPMinchoE</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSMinchoE</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSoeiKakugothicUB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGGyoshotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPGyoshotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSGyoshotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSoeiKakupoptai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSSoeiPresenceEB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPSoeiPresenceEB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGGothicB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGGothicE</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGGothicM</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSoeiPresenceEB</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGPKyokashotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSSoeiKakupoptai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>HGSeikaishotaiPRO</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLKyokashotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLMincho</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLPMincho</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLPGothic</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLPKyokashotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLMarugothicM</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLGyoshotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLPGyoshotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLSGyoshotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLPMarugothicM</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLSMarugothicM</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLSKyokashotai</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>TLGothic</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnBatangBold</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnBatang</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnBom</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnDinaruBold</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnDinaruLight</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnDinaru</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnDotumBold</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnDotum</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnGraphicBold</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnGraphic</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnGungseo</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnJamoBatang</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnJamoDotum</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnJamoNovel</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnJamoSora</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnPenheulim</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnPen</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnPilgia</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnPilgiBold</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnPilgi</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnShinmun</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnTaza</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnVada</string></test> + <edit name="autohint"><bool>true</bool></edit> + </match> + <match target="font"> + <test name="family"><string>UnYetgul</string></test> + <edit name="autohint"><bool>true</bool></edit> </match> -  <match target="font"> <test name="family"> <string>Andale Mono</string> @@ -241,6 +453,7 @@ <bool>false</bool> </edit> </match> + -->  <match target="font"> - <test name="family"> - <string>MingLiU</string> - <string>PMingLiU</string> - </test> - <edit name="autohint"> - <bool>false</bool> - </edit> + <test name="family"><string>MingLiU</string></test> + <edit name="autohint"><bool>false</bool></edit> </match> + <match target="font"> + <test name="family"><string>PMingLiU</string></test> + <edit name="autohint"><bool>false</bool></edit> + </match> +  ++++++ 16-suse-hintstyle.conf ++++++ --- /var/tmp/diff_new_pack.4RqS9Q/_old 2012-10-03 07:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.4RqS9Q/_new 2012-10-03 07:13:13.000000000 +0200 @@ -127,24 +127,56 @@ 47 and 48 of referred bug. --> <match target="font"> - <test name="fullname"> - <string>IPAexGothic</string> - <string>IPAexMincho</string> - <string>IPAGothic BoldItalic</string> - <string>IPAGothic Bold</string> - <string>IPAGothic Italic</string> - <string>IPAGothic</string> - <string>IPAMincho</string> - <string>IPAPGothic BoldItalic</string> - <string>IPAPGothic Bold</string> - <string>IPAPGothic Italic</string> - <string>IPAPGothic</string> - <string>IPAPMincho</string> - <string>IPAUIGothic</string> - </test> - <edit name="hintstyle"> - <const>hintnone</const> - </edit> + <test name="fullname"><string>IPAexGothic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAexMincho</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAGothic BoldItalic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAGothic Bold</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAGothic Italic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAGothic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAMincho</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAPGothic BoldItalic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAPGothic Bold</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAPGothic Italic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAPGothic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAPMincho</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> + </match> + <match target="font"> + <test name="fullname"><string>IPAUIGothic</string></test> + <edit name="hintstyle"><const>hintnone</const></edit> </match> </fontconfig> ++++++ 18-suse-bitmaps-misc.conf ++++++ --- /var/tmp/diff_new_pack.4RqS9Q/_old 2012-10-03 07:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.4RqS9Q/_new 2012-10-03 07:13:13.000000000 +0200 @@ -13,18 +13,32 @@ pixels again. --> <match target="font"> - <test name="family"> - <string>IPAMincho</string> - <string>IPAGothic</string> - <string>IPAPMincho</string> - <string>IPAPGothic</string> - <string>IPAUIGothic</string> - <string>IPAexMincho</string> - <string>IPAexGothic</string> - </test> - <edit name="embeddedbitmap"> - <bool>false</bool> - </edit> + <test name="family"><string>IPAMincho</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> </match> - + <match target="font"> + <test name="family"><string>IPAGothic</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>IPAPMincho</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>IPAPGothic</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>IPAUIGothic</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>IPAexMincho</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> + <match target="font"> + <test name="family"><string>IPAexGothic</string></test> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> + </fontconfig> ++++++ cloexec.patch ++++++ --- /var/tmp/diff_new_pack.4RqS9Q/_old 2012-10-03 07:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.4RqS9Q/_new 2012-10-03 07:13:13.000000000 +0200 @@ -1,8 +1,8 @@ -Index: configure.in +Index: configure.ac =================================================================== ---- configure.in.orig -+++ configure.in -@@ -57,7 +57,9 @@ dnl ==================================== +--- configure.ac.orig ++++ configure.ac +@@ -58,7 +58,9 @@ dnl ==================================== AC_CONFIG_HEADERS(config.h) @@ -13,21 +13,21 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL -@@ -119,7 +121,7 @@ AC_TYPE_PID_T +@@ -135,7 +137,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP --AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) -+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) +-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs]) ++AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs]) # - # Checks for iconv + if test "x$ac_cv_func_fstatvfs" = "xyes"; then Index: src/fcatomic.c =================================================================== --- src/fcatomic.c.orig +++ src/fcatomic.c -@@ -107,10 +107,14 @@ FcAtomicLock (FcAtomic *atomic) - #ifdef HAVE_LINK +@@ -109,10 +109,14 @@ FcAtomicLock (FcAtomic *atomic) + strcpy ((char *) atomic->tmp, (char *) atomic->file); strcat ((char *) atomic->tmp, TMP_NAME); +#ifdef HAVE_MKOSTEMP @@ -46,7 +46,7 @@ =================================================================== --- src/fccache.c.orig +++ src/fccache.c -@@ -216,7 +216,7 @@ FcDirCacheOpenFile (const FcChar8 *cache +@@ -150,7 +150,7 @@ FcDirCacheOpenFile (const FcChar8 *cache if (FcStat (cache_file, file_stat) < 0) return -1; #endif @@ -55,7 +55,7 @@ if (fd < 0) return fd; #ifndef _WIN32 -@@ -963,7 +963,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi +@@ -904,7 +904,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi if (!FcAtomicLock (atomic)) goto bail3; ++++++ fontconfig-2.9.0.tar.bz2 -> fontconfig-2.10.0.tar.bz2 ++++++ ++++ 149129 lines of diff (skipped) ++++++ fontconfig-doc-2.9.0.tar.bz2 -> fontconfig-doc-2.10.0.tar.bz2 ++++++ ++++ 17249 lines of diff (skipped) ++++++ metric-croscore.patch ++++++ --- /var/tmp/diff_new_pack.4RqS9Q/_old 2012-10-03 07:13:14.000000000 +0200 +++ /var/tmp/diff_new_pack.4RqS9Q/_new 2012-10-03 07:13:14.000000000 +0200 @@ -55,27 +55,3 @@ <family>Cumberland</family> <default> <family>Courier New</family> -@@ -219,6 +244,7 @@ - <alias binding="same"> - <family>Arial</family> - <accept> -+ <family>Arimo</family> - <family>Liberation Sans</family> - <family>Albany</family> - <family>Albany AMT</family> -@@ -228,6 +254,7 @@ - <alias binding="same"> - <family>Times New Roman</family> - <accept> -+ <family>Tinos</family> - <family>Liberation Serif</family> - <family>Thorndale</family> - <family>Thorndale AMT</family> -@@ -237,6 +264,7 @@ - <alias binding="same"> - <family>Courier New</family> - <accept> -+ <family>Cousine</family> - <family>Liberation Mono</family> - <family>Cumberland</family> - <family>Cumberland AMT</family> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flickrnet for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package flickrnet for openSUSE:Factory checked in at 2012-10-03 07:12:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flickrnet (Old) and /work/SRC/openSUSE:Factory/.flickrnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flickrnet", Maintainer is "StShaw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/flickrnet/flickrnet.changes 2012-03-05 17:59:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.flickrnet.new/flickrnet.changes 2012-10-03 07:12:02.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Sep 30 05:42:39 UTC 2012 - sshaw(a)decriptor.com + +- Updated to version 3.5 + + Subscription methods (push.*) + + Photo Location Suggestion methods (photos.suggestions.*) + + Group Discussion and Joining methods (groups.discuss.* etc) + + Large raft of new unit tests to improve code coverage + + Custom exceptions thrown based on errors returned from Flickr. All inherit from FlickrApiException so backwards compatible. + + Fix in OAuth code to handle international character correctly. + + Support for Large Square (150x150) and Small 320 urls. + + Update to ParseDateGranularity function so it checks string, rather than capturing exceptions. + + Many more fixes and updates +- Removed assemblyinfo patch + +------------------------------------------------------------------- Old: ---- FlickrNet2.2-Src-48055.zip assemblyinfo.patch New: ---- FlickrNet3.5-Src-99196.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flickrnet.spec ++++++ --- /var/tmp/diff_new_pack.US0hcd/_old 2012-10-03 07:12:03.000000000 +0200 +++ /var/tmp/diff_new_pack.US0hcd/_new 2012-10-03 07:12:03.000000000 +0200 @@ -17,14 +17,13 @@ Name: flickrnet -Version: 2.2 +Version: 3.5 Release: 0 Summary: Flickr License: LGPL-2.1+ or CPL-1.0 Group: Productivity/Networking/Other Url: http://www.codeplex.com/FlickrNet -Source: FlickrNet2.2-Src-48055.zip -Patch0: assemblyinfo.patch +Source: FlickrNet3.5-Src-99196.zip BuildRequires: mono-devel BuildRequires: unzip BuildArch: noarch @@ -35,7 +34,7 @@ %package devel Summary: Development files for Flickr.Net Group: Development/Languages/Mono -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: pkgconfig %description devel @@ -46,10 +45,9 @@ %prep %setup -n FlickrNet -q -%patch0 -p1 %build -gmcs -debug -target:library -out:FlickrNet.dll -r:System.Web.dll -r:System.Drawing.dll *.cs +xbuild FlickrNet.csproj cat << EOF > flickrnet.pc prefix=%{_prefix} assemblies_dir=\${prefix}/lib/mono/flickrnet @@ -61,7 +59,7 @@ EOF %install -gacutil -i FlickrNet.dll -package flickrnet -root %{buildroot}%{_prefix}/lib +gacutil -i bin/Debug/FlickrNet.dll -package flickrnet -root %{buildroot}%{_prefix}/lib mkdir -p %{buildroot}%{_datadir}/pkgconfig cp flickrnet.pc %{buildroot}%{_datadir}/pkgconfig/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-10-03 07:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-09-17 01:29:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-10-03 07:11:21.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 23 13:32:25 UTC 2012 - i(a)marguerite.su + +- fix openSUSE 12.1 and below build + * 4.2.6 uses a Qt 4.8+ only function (QDBusConnection) so it fails on 12.1 and below. + * weng fix it. + +------------------------------------------------------------------- New: ---- fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.GEac0Q/_old 2012-10-03 07:11:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GEac0Q/_new 2012-10-03 07:11:23.000000000 +0200 @@ -38,6 +38,8 @@ Source8: openSUSE-default.tar.gz #FIX-FOR-UPSTREAM i(a)marguerite.su - dont download online #Patch1: fix_fcitx_googlecode_resolv_error.patch +#FIX-FOR-OPENSUSE wengxt(a)gmail.com - fix QDBusConnection in Qt 4.7 +Patch2: fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -358,6 +360,9 @@ %prep %setup -q -n %{name}-%{version} #%patch1 -p1 +%if 0%{?suse_version} <= 1210 +%patch2 -p1 +%endif %build mkdir build ++++++ fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch ++++++ diff --git a/src/frontend/qt/fcitx-input-context.cpp b/src/frontend/qt/fcitx-input-context.cpp index 5ba941b..6e5a9d9 100644 --- a/src/frontend/qt/fcitx-input-context.cpp +++ b/src/frontend/qt/fcitx-input-context.cpp @@ -113,11 +113,37 @@ typedef QInputMethodEvent::Attribute QAttribute; static bool key_filtered = false; +QByteArray QFcitxInputContext::localMachineId() +{ +#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) + return QDBusConnection::localMachineId(); +#else + QFile file1("/var/lib/dbus/machine-id"); + QFile file2("/etc/machine-id"); + QFile* fileToRead = NULL; + if (file1.open(QIODevice::ReadOnly)) { + fileToRead = &file1; + } + else if (file2.open(QIODevice::ReadOnly)) { + fileToRead = &file2; + } + if (fileToRead) { + QByteArray result = fileToRead->readLine(1024); + fileToRead->close(); + result = result.trimmed(); + if (!result.isEmpty()) + return result; + } + return "machine-id"; +#endif +} + QString QFcitxInputContext::socketFile() { char* addressFile = NULL; - asprintf(&addressFile, "%s-%d", QDBusConnection::localMachineId().data(), fcitx_utils_get_display_number()); + + asprintf(&addressFile, "%s-%d", localMachineId().data(), fcitx_utils_get_display_number()); char* file = NULL; diff --git a/src/frontend/qt/fcitx-input-context.h b/src/frontend/qt/fcitx-input-context.h index 6c7ecf4..ed7d2db 100644 --- a/src/frontend/qt/fcitx-input-context.h +++ b/src/frontend/qt/fcitx-input-context.h @@ -102,6 +102,7 @@ private Q_SLOTS: void updateCursor(); #endif private: + static QByteArray localMachineId(); static QString socketFile(); static QString address(); void cleanUp(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit device-mapper for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package device-mapper for openSUSE:Factory checked in at 2012-10-03 07:11:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/device-mapper (Old) and /work/SRC/openSUSE:Factory/.device-mapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "device-mapper", Maintainer is "DMZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/device-mapper/device-mapper.changes 2012-07-30 21:50:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.device-mapper.new/device-mapper.changes 2012-10-03 07:11:10.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 27 01:08:44 UTC 2012 - nfbrown(a)suse.com + +- mkinitrd-devmapper-*: tidy up dm_modules handling. + It is confusing that 'save_var' isn't called on it, + so call it. + As these modules need to be in initrd, but not + forcibly loaded, they could be listed as + 'udevmodules'. + Also filter out 'snapshot-origin' - a table without + a module. (bnc#779965) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/device-mapper/lvm2-clvm.changes 2011-10-21 16:28:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.device-mapper.new/lvm2-clvm.changes 2012-10-03 07:11:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 27 01:12:17 UTC 2012 - nfbrown(a)suse.com + +- lvm2-clvm.spec: make sure MODPROBE_CMD is set properly + when configure is run. Without it, modules are + not auto-loaded. Also fix problem with LDFLAGS (bnc#779965) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/device-mapper/lvm2.changes 2012-04-23 09:12:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.device-mapper.new/lvm2.changes 2012-10-03 07:11:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 27 01:11:17 UTC 2012 - nfbrown(a)suse.com + +- lvm2.spec: make sure MODPROBE_CMD is set properly + when configure is run. Without it, modules are + not auto-loaded. (bnc#779965) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.aZSbf6/_old 2012-10-03 07:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aZSbf6/_new 2012-10-03 07:11:12.000000000 +0200 @@ -77,8 +77,8 @@ %patch22 -p1 %build -MODPROBE_CMD=/sbin/modprobe \ -LDFLAGS="-L /usr/%_lib/openais" \ +export MODPROBE_CMD=/sbin/modprobe +export LDFLAGS="-L /usr/%_lib/openais" %configure --prefix=/ \ --enable-selinux \ --enable-cmdlib \ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.aZSbf6/_old 2012-10-03 07:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aZSbf6/_new 2012-10-03 07:11:12.000000000 +0200 @@ -102,7 +102,7 @@ %patch81 -p1 %build -MODPROBE_CMD=/sbin/modprobe \ +export MODPROBE_CMD=/sbin/modprobe %configure --prefix=/ \ --bindir=/bin --libdir=/%_lib --with-userlibdir=%_libdir \ --sbindir=/sbin --enable-dmeventd \ ++++++ mkinitrd-devmapper-boot.sh ++++++ --- /var/tmp/diff_new_pack.aZSbf6/_old 2012-10-03 07:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aZSbf6/_new 2012-10-03 07:11:12.000000000 +0200 @@ -1,8 +1,7 @@ #!/bin/bash #%stage: boot #%depends: start -#%modules: $dm_modules -#%udevmodules: dm-mod dm-snapshot +#%udevmodules: dm-mod dm-snapshot $dm_modules #%programs: /sbin/dmsetup /sbin/blockdev # dm-crypt dm-zero dm-mirror #%if: -n "$root_dm" ++++++ mkinitrd-devmapper-setup.sh ++++++ --- /var/tmp/diff_new_pack.aZSbf6/_old 2012-10-03 07:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aZSbf6/_new 2012-10-03 07:11:12.000000000 +0200 @@ -21,7 +21,8 @@ # Add all dm modules dm_modules= for table in $(dmsetup table | cut -f 4 -d ' ' | sort | uniq); do - if [ "$table" ] && [ "$table" != "linear" ] && [ "$table" != "striped" ] ; then + if [ "$table" ] && [ "$table" != "linear" ] && + [ "$table" != "striped" ] && [ "$table" != "snapshot-origin" ] ; then dm_modules="$dm_modules dm-$table" fi done @@ -35,4 +36,5 @@ cp /lib/udev/rules.d/13-dm-disk.rules lib/udev/rules.d cp /lib/udev/rules.d/95-dm-notify.rules lib/udev/rules.d save_var root_dm + save_var dm_modules fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-file-utils for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package desktop-file-utils for openSUSE:Factory checked in at 2012-10-03 07:10:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/desktop-file-utils (Old) and /work/SRC/openSUSE:Factory/.desktop-file-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "desktop-file-utils", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/desktop-file-utils/desktop-file-utils.changes 2012-03-07 20:08:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-file-utils.new/desktop-file-utils.changes 2012-10-03 07:10:55.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Oct 1 11:22:30 UTC 2012 - vuntz(a)opensuse.org + +- Import SuSEconfig script from glib2 here: + + This is needed as SuSEconfig is now dead, and we need a way to + generate the defaults.list file needed for the default MIME + associations. Part of bnc#782120. + + Add suse-update-mime-defaults as source, and install it. + + Call suse-update-mime-defaults in %post. + + Call suse-update-mime-defaults from the %desktop_database_post + and %desktop_database_postun macros defined in + macros.desktop-file-utils. This way, packages using those + macros will regenerate the defaults.list files on + install/removal. + +------------------------------------------------------------------- +Wed Sep 26 08:24:42 UTC 2012 - idonmez(a)suse.com + +- BuildIgnore dbus-1-x11 to break the cycle + +------------------------------------------------------------------- New: ---- suse-update-mime-defaults ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-file-utils.spec ++++++ --- /var/tmp/diff_new_pack.O9XNHX/_old 2012-10-03 07:10:56.000000000 +0200 +++ /var/tmp/diff_new_pack.O9XNHX/_new 2012-10-03 07:10:56.000000000 +0200 @@ -24,11 +24,13 @@ Group: Development/Tools/Other Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{v… +Source1: suse-update-mime-defaults Source2: macros.desktop-file-utils # PATCH-FEATURE-OPENSUSE desktop-file-utils-suse-keys.patch vuntz(a)opensuse.org -- Handle SUSE-specific keys in validator. This is not strictly necessary, since they are prefixed with X-, but we can verify that the value has the right type. Patch0: desktop-file-utils-suse-keys.patch BuildRequires: glib2-devel BuildRequires: pkg-config +#!BuildIgnore: dbus-1-x11 # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz Requires: aaa_base @@ -57,6 +59,8 @@ # manually do it. test ! -f %{buildroot}%{_datadir}/emacs/site-lisp/desktop-entry-mode.el install -D -m644 misc/desktop-entry-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/desktop-entry-mode.el +# Install suse-update-mime-defaults +install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/suse-update-mime-defaults # Install rpm macros install -D -m644 %{S:2} %{buildroot}%{_sysconfdir}/rpm/macros.desktop-file-utils # Create ghosts based on default $XDG_DATA_DIRS: @@ -65,6 +69,7 @@ %post %{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true +%{_bindir}/suse-update-mime-defaults || true %files %defattr(-, root, root) @@ -72,6 +77,7 @@ %{_bindir}/desktop-file-edit %{_bindir}/desktop-file-install %{_bindir}/desktop-file-validate +%{_bindir}/suse-update-mime-defaults %{_bindir}/update-desktop-database %ghost %{_datadir}/applications/mimeinfo.cache %{_mandir}/man1/desktop-file-edit.1* ++++++ macros.desktop-file-utils ++++++ --- /var/tmp/diff_new_pack.O9XNHX/_old 2012-10-03 07:10:56.000000000 +0200 +++ /var/tmp/diff_new_pack.O9XNHX/_new 2012-10-03 07:10:56.000000000 +0200 @@ -22,7 +22,10 @@ %else \ %{_bindir}/update-desktop-database --quiet "%{_datadir}/applications" || true \ %endif \ -fi +fi \ +if test -x %{_bindir}/suse-update-mime-defaults; then \ + %{_bindir}/suse-update-mime-defaults || true \ +fi # On uninstall, update the desktop database. Note: we ignore upgrades (already # handled in %post of the new package). @@ -35,4 +38,7 @@ %{_bindir}/update-desktop-database --quiet "%{_datadir}/applications" || true \ %endif \ fi \ + if test -x %{_bindir}/suse-update-mime-defaults; then \ + %{_bindir}/suse-update-mime-defaults || true \ + fi \ fi ++++++ suse-update-mime-defaults ++++++ #!/bin/sh # # suse-update-mime-defaults - create default application ordering for MIME associations # # Copyright (C) 2012 Guido Berhoerster <gber(a)opensuse.org> # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. # # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # TORTIOUS ACTION, ARISING OUT OF PERFORMANCE OF THIS SOFTWARE. # export LC_ALL=C # reset XDG_DATA_DIRS so it can be trusted unset XDG_DATA_DIRS if [ "${PROFILEREAD}" != "true" ]; then . $r/etc/profile fi for desktop in gnome xfce lxde; do awk -vdesktop=${desktop} ' # print a warning to stderr function warn(msg, cmd) { cmd = "cat >&2" print msg | cmd close(cmd) } # print an error message and exit with the given exit status function err(status, msg) { warn(msg) exit_status = status exit exit_status } # delete all elements of an array function delete_array(arr, i) { for (i in arr) { delete arr[i] } } # find preferred combination of mimetype and category function find_preferred_category(mimetypes_categories, categories, mimetype, i) { for (i = 1; i in categories; i++) { if (mimetype SUBSEP categories[i] in mimetypes_categories) { return mimetypes_categories[mimetype,categories[i]] } } } # sort keys of an array by index (using the awk default comparison) function asorti2(src, dest, key, len) { len = 0 delete_array(dest) for (key in src) { dest[len++] = key } _qsorti(dest, 0, len - 1); } function array_swap(arr, i, j, tmp) { tmp = arr[i] arr[i] = arr[j] arr[j] = tmp } # Based on Bentley, J. L., 2000. Programming Pearls. 2nd ed. Reading, MA: # Addison-Wesley Professional. function _qsorti(dest, l, u, val, i, j) { if (l >= u) { return } array_swap(dest, l, l + int(rand() * (u - l))) val = dest[l] i = l j = u + 1 while (1) { do { i++ } while (i <= u && dest[i] < val) do { j-- } while (dest[j] > val) if (i > j) { break } array_swap(dest, i, j) } array_swap(dest, l, j) _qsorti(dest, l, j - 1) _qsorti(dest, j + 1, u) } BEGIN { desktop = desktop != "" ? desktop : "gnome" if (desktop == "gnome") { categories_list = "GNOME,GTK" } else if (desktop == "xfce") { categories_list = "XFCE,GTK" } else if (desktop == "lxde") { categories_list = "GTK" } split(categories_list, categories, /,/) root = ENVIRON["r"] defaults_conf = root "/etc/" desktop "_defaults.conf" # parse desktop defaults preferences lineno = 0 while ((getline < defaults_conf) > 0) { lineno++ if (NF == 0 || $1 ~ /^#/) { # skip comments and empty lines continue } else if (NF != 1) { err(1, "syntax error in " defaults_conf " line " lineno) } else if (split($1, arr, /=/) == 2) { # handle MIME type defaults mimetype_default_apps[arr[1]] = arr[2] } else if ($1 ~ /^!.+\.desktop$/) { # handle preferred default applications preferred_default_apps[substr($1, 2)] = substr($1, 2) } else if ($1 ~ /^.+\.desktop$/) { # handle regular default applications default_apps[$1] = $1 } else { err(1, "syntax error in " defaults_conf ", line " lineno) } } close(defaults_conf) # find all desktop files for (i = split("XDG_DATA_DIRS" in ENVIRON ? ENVIRON["XDG_DATA_DIRS"] : \ "/usr/local/share:/usr/share", xdg_data_dirs, /:/); i > 0; i--) { # XDG_DATA_DIRS is trusted here because it has been reset cmd = "ls -1 -- \"" root xdg_data_dirs[i] "/applications/\"*.desktop " \ "2>/dev/null" while ((cmd | getline desktopfile) > 0) { l = split(desktopfile, arr, "/") desktopfiles[arr[l]] = desktopfile } close(cmd) } # process all desktop files in alphabetical order asorti2(desktopfiles, desktopfiles_keys) for (i = 0; i in desktopfiles_keys; i++) { # parse a desktop file desktopfile = desktopfiles_keys[i] delete_array(desktopfile_mimetypes) delete_array(desktopfile_categories) lineno = 0 in_desktop_entry = 0 while ((getline < desktopfiles[desktopfile]) > 0) { lineno++ if (NF == 0 || $1 ~ /^#/) { # skip comments and empty lines continue } else if (in_desktop_entry == 0 && \ $0 ~ /^\[Desktop Entry\][\t ]*$/) { # desktop entry group in_desktop_entry = 1 } else if (in_desktop_entry == 1) { if (in_desktop_entry == 1 && $1 ~ /^\[/) { # quit when a different group starts, "Desktop Entry" must # come first break } else if ($0 ~ /^MimeType *=/ && split($0, arr, /=/) == 2) { # handle MimeTypes gsub(/(^ *|; *$)/, "", arr[2]) split(arr[2], desktopfile_mimetypes, /;/) } else if ($0 ~ /^Categories *=/ && split($0, arr, /=/) == 2) { # handle Categories gsub(/(^ *|; *$)/, "", arr[2]) split(arr[2], desktopfile_categories, /;/) } else if ($0 ~ /^[A-Za-z0-9\[\]@_-]+ *=/) { # skip other keys continue } } else { warn("syntax error in " desktopfiles[desktopfile] ", line " \ lineno) break } } close(desktopfiles[desktopfile]) # store the results for (j = 1; j in desktopfile_mimetypes; j++) { if (desktopfile_mimetypes[j] in mimetype_default_apps && \ mimetype_default_apps[desktopfile_mimetypes[j]] == \ desktopfile) { mimetype_defaults[desktopfile_mimetypes[j]] = desktopfile } if (desktopfile in preferred_default_apps) { preferred_defaults[desktopfile_mimetypes[j]] = desktopfile } if (desktopfile in default_apps) { defaults[desktopfile_mimetypes[j]] = desktopfile } for (k = 1; k in desktopfile_categories; k++) { mimetypes_categories[desktopfile_mimetypes[j], \ desktopfile_categories[k]] = desktopfile } generic_mimetypes[desktopfile_mimetypes[j]] = desktopfile } } # determine default mimetype handlers for (mimetype in generic_mimetypes) { if (mimetype in mimetype_defaults) { defaults_list[mimetype] = mimetype_defaults[mimetype] } else if (mimetype in preferred_defaults) { defaults_list[mimetype] = preferred_defaults[mimetype] } else if (mimetype in defaults) { defaults_list[mimetype] = defaults[mimetype] } else if ((desktopfile = \ find_preferred_category(mimetypes_categories, categories, \ mimetype)) != "") { defaults_list[mimetype] = desktopfile } else if (mimetype in generic_mimetypes) { defaults_list[mimetype] = generic_mimetypes[mimetype] } } print "# generated by suse-update-mime-defaults from " defaults_conf print "[Default Applications]" asorti2(defaults_list, defaults_list_keys) for (i = 0; i in defaults_list_keys; i++) { mimetype = defaults_list_keys[i] printf("%s=%s\n", mimetype, defaults_list[mimetype]) } } ' >$r/var/cache/gio-2.0/${desktop}-defaults.list done -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dbus-sharp for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package dbus-sharp for openSUSE:Factory checked in at 2012-10-03 07:08:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-sharp (Old) and /work/SRC/openSUSE:Factory/.dbus-sharp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-sharp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-sharp/dbus-sharp.changes 2011-09-23 01:54:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dbus-sharp.new/dbus-sharp.changes 2012-10-03 07:08:23.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 28 19:44:45 UTC 2012 - dimstar(a)opensuse.org + +- Add dbus-sharp-signal-dispatch.patch: Fix broken signal dispatch. + The signals for example do not reach applications like tomboy, + which avoids them from closing down on session termination, until + they are forcibly killed by the session manager (bnc#780933). + +------------------------------------------------------------------- New: ---- dbus-sharp-signal-dispatch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-sharp.spec ++++++ --- /var/tmp/diff_new_pack.YeyVLS/_old 2012-10-03 07:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.YeyVLS/_new 2012-10-03 07:08:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dbus-sharp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,12 +23,14 @@ Name: dbus-sharp Version: 0.7.0 -Release: 3 -License: MIT +Release: 0 Summary: Managed C# implementation of D-Bus -Url: http://mono.github.com/dbus-sharp/ +License: MIT Group: Development/Libraries/Other +Url: http://mono.github.com/dbus-sharp/ Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM dbus-sharp-signal-dispatch.patch bnc#780933 dimstar(a)opensuse.org -- Fix broken signal dispatch, from upstream git. +Patch0: dbus-sharp-signal-dispatch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: pkgconfig @@ -46,7 +48,6 @@ Version 0.11 and study of the wire protocol of existing tools. %package devel -License: MIT Summary: Managed C# implementation of D-Bus Group: Development/Libraries/Other Requires: %{name} = %{version} @@ -60,6 +61,7 @@ %prep %setup -q +%patch0 -p0 %build %configure \ ++++++ dbus-sharp-signal-dispatch.patch ++++++ === modified file 'src/BusObject.cs' --- src/BusObject.cs 2010-10-03 15:19:44 +0000 +++ src/BusObject.cs 2011-10-04 16:18:08 +0000 @@ -56,7 +56,10 @@ rule.Fields.Add (FieldCode.Interface, new MatchTest (iface)); rule.Fields.Add (FieldCode.Member, new MatchTest (member)); rule.Fields.Add (FieldCode.Path, new MatchTest (object_path)); - rule.Fields.Add (FieldCode.Sender, new MatchTest (alt_bus_name ?? bus_name)); + // FIXME: Cause a regression compared to 0.6 as name wasn't matched before + // the problem arises because busname is not used by DBus daemon and + // instead it uses the canonical name of the sender (i.e. similar to ':1.13') + //rule.Fields.Add (FieldCode.Sender, new MatchTest (alt_bus_name ?? bus_name)); if (adding) { if (conn.Handlers.ContainsKey (rule)) === modified file 'src/Connection.cs' --- src/Connection.cs 2010-10-03 15:19:44 +0000 +++ src/Connection.cs 2011-10-04 16:18:08 +0000 @@ -272,7 +272,7 @@ rule.MessageType = MessageType.Signal; rule.Fields.Add (FieldCode.Interface, new MatchTest (signal.Interface)); rule.Fields.Add (FieldCode.Member, new MatchTest (signal.Member)); - rule.Fields.Add (FieldCode.Sender, new MatchTest (signal.Sender)); + //rule.Fields.Add (FieldCode.Sender, new MatchTest (signal.Sender)); rule.Fields.Add (FieldCode.Path, new MatchTest (signal.Path)); Delegate dlg; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmis-client for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package cmis-client for openSUSE:Factory checked in at 2012-10-03 07:06:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmis-client (Old) and /work/SRC/openSUSE:Factory/.cmis-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmis-client", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cmis-client/cmis-client.changes 2012-09-14 12:21:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmis-client.new/cmis-client.changes 2012-10-03 07:06:53.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Sep 13 12:38:54 UTC 2012 - cbosdonnat(a)suse.com + +- Update to version 0.3.0 + + 0.2.2 + + Fixed soname for the library + + Allow building against libcurl 7.13.1 + + 0.2.3 + + Fixed SharePoint support + + Conditional build of man page + + 0.3.0 + + Added Document::checkOut(), Document::cancelCheckout() and Document::checkIn() + + Added Object::move( ) -- Grau Data + + Fixes for xcmis and cloudoku.com -- Grau Data + + Added Document::getAllVersions( ) + + WebService binding implementation + + Session factory automatically detects which binding to use + + C wrapper API + + Unit tests are now split between quick ones and the ones needing a CMIS server + +------------------------------------------------------------------- Old: ---- libcmis-0.2.1.tar.gz New: ---- libcmis-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmis-client.spec ++++++ --- /var/tmp/diff_new_pack.zdHfSX/_old 2012-10-03 07:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.zdHfSX/_new 2012-10-03 07:06:55.000000000 +0200 @@ -16,12 +16,12 @@ # -%define soname 0_2-0 -%define incname 0.2 +%define soname 0_3-3 +%define incname 0.3 %define _name libcmis Name: cmis-client -Version: 0.2.1 +Version: 0.3.0 Release: 0 Summary: Sample CMIS client License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ @@ -32,8 +32,10 @@ BuildRequires: docbook2X BuildRequires: gcc-c++ BuildRequires: intltool +BuildRequires: libcppunit-devel BuildRequires: libcurl-devel BuildRequires: libxml2-devel +BuildRequires: libxslt BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{_name}-%{soname} = %{version} @@ -57,12 +59,29 @@ Development files for libcmis. LibCMIS is a C++ client library for the CMIS interface. This allows C++ applications to connect to any CMIS-enabled repositories. +%package -n %{_name}-c-%{soname} +Summary: C Wrapper for libcmis, a library for accessing CMIS-enabled servers +Group: Development/Libraries/C and C++ + +%description -n %{_name}-c-%{soname} +libcmis-c is a C client library for the CMIS interface. This allows C applications to connect to any CMIS-enabled repositories. +It is only a wrapper for its C++ sister libcmis. + +%package -n %{_name}-c-devel +Summary: Libcmis-c development files +Group: Development/Libraries/C and C++ +Requires: %{_name}-c-devel = %{version} + +%description -n %{_name}-c-devel +Development files for libcmis-c. Libcmis-c is a C client library for the CMIS interface. +This allows C applications to connect to any CMIS-enabled repositories. It is only a wrapper for its C++ sister libcmis. + %prep %setup -q -n %{_name}-%{version} %build %configure \ - --disable-tests \ + --disable-long-tests \ --disable-static \ --disable-werror make %{?_smp_mflags} @@ -75,8 +94,10 @@ make check %post -n %{_name}-%{soname} -p /sbin/ldconfig +%post -n %{_name}-c-%{soname} -p /sbin/ldconfig %postun -n %{_name}-%{soname} -p /sbin/ldconfig +%postun -n %{_name}-c-%{soname} -p /sbin/ldconfig %files %defattr(-, root, root) @@ -86,12 +107,23 @@ %files -n %{_name}-%{soname} %defattr(-, root, root) %doc AUTHORS COPYING.LGPL COPYING.MPL COPYING.GPL NEWS README -%{_libdir}/*.so.* +%{_libdir}/%{_name}-%{incname}.so.* %files -n %{_name}-devel %defattr(-,root,root) %{_includedir}/%{_name}-%{incname} -%{_libdir}/pkgconfig/*.pc -%{_libdir}/*.so +%{_libdir}/pkgconfig/%{_name}-%{incname}.pc +%{_libdir}/%{_name}-%{incname}.so + +%files -n %{_name}-c-%{soname} +%defattr(-, root, root) +%doc AUTHORS COPYING.LGPL COPYING.MPL COPYING.GPL NEWS README +%{_libdir}/%{_name}-c-%{incname}.so.* + +%files -n %{_name}-c-devel +%defattr(-,root,root) +%{_includedir}/%{_name}-c-%{incname} +%{_libdir}/pkgconfig/%{_name}-c-%{incname}.pc +%{_libdir}/%{_name}-c-%{incname}.so %changelog ++++++ libcmis-0.2.1.tar.gz -> libcmis-0.3.0.tar.gz ++++++ ++++ 27102 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 calligra for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2012-10-03 07:05:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-doc.changes 2012-09-20 14:57:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra-doc.changes 2012-10-03 07:05:55.000000000 +0200 @@ -1,0 +2,62 @@ +Sun Sep 23 21:41:16 UTC 2012 - nico.kruber(a)gmail.com + +- merged package from KR49: + * update to calligra 2.5.2 (rabauke(a)opensuse.org) + - Sheets: + * Fixed bug that prevented plugins from showing on + Settings->Configure Sheets…->Plugins page (bug 291343) + - Stage: + * Fixed display of shapes in the document docker + * Fix unwanted offset after cancel slideshow (bug 306118) + - Kexi: + * Fixed bug in Query Designer: removed SQL Editor’s history + as it was not functional (bug 306145) + * Make string concatenation operator || work in + Query Designer (bug 305793) + * Startup GUI: fetch startup UI definition from x.y.0 URL + for any x.y.z version, not from x.y.z URL + * Buildsystem: make it possible to disable database drivers + even if their dependencies are present and found + (wish 305683) + - Common: + * Fix resizing of horizontal and vertical lines (bug 306133) + * Fix reordering of shapes (bug 306309) + * Fix some icons for the formula shape. + * Trigger repaint of the picture shape after insertion + (bug 305548) + * Fix some corner cases when loading borders + * removed bnc733534-calligra-msword-overflow-fix.diff; + fixed upstream (nico.kruber(a)gmail.com) + * update to 2.5.1 (rabauke(a)opensuse.org) + - Words: + * Fix: crash when saving file with imported text (bug 298899) + * Do not save with an attribue that makes LibreOffice and + OpenOffice crash (BUG: 298689 ) + - Kexi: + * Workaround for visual glitch of Oxygen style for menu widget + in kexi (bug 305051) + * Fix crash on importing CSV files with more than 1024 columns + (bug 304405) and with Mac line endings (bug 304329) + - Krita: + * Make it possible to open Krita 2.5 documents in 2.4 if no + composition was set. + * Fix: conversion of HDR colorspaces + * Fix: crash when merging down the top layer if there is a + selection (bug 305465) + - Common: + * Fix: Uncompressed ODF is saved in wrong directory (bug 305794) + * Don’t mirror an image with a width of one pixel or less + (bug 166324) + * update to 2.5 (nico.kruber(a)gmail.com) + - See http://www.calligra.org/news/calligra-2-5-released/ + * Fix remaining build errors (toddrme2178(a)gmail.com) + * Update to 2.5 RC 1 (2.4.92) (toddrme2178(a)gmail.com) + - See http://www.calligra.org/news/calligra-2-5-release-candidate/ +- removed calligra-marblewidget.patch; fixed upstream + +------------------------------------------------------------------- +Fri Sep 21 09:17:09 UTC 2012 - idonmez(a)suse.com + +- Add explicit glu dependency + +------------------------------------------------------------------- calligra.changes: same change Old: ---- bnc733534-calligra-msword-overflow-fix.diff calligra-2.4.3.tar.bz2 calligra-marblewidget.patch New: ---- calligra-2.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-doc.spec ++++++ --- /var/tmp/diff_new_pack.R2bkEw/_old 2012-10-03 07:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.R2bkEw/_new 2012-10-03 07:06:06.000000000 +0200 @@ -17,13 +17,13 @@ Name: calligra-doc -Version: 2.4.3 +Version: 2.5.2 Release: 0 Summary: Documentation of the Calligra Suite License: GFDL-1.2 Group: Documentation/HTML Url: http://www.calligra.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/calligra-%{version}/calligra-%{version}.… +Source0: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-%{version}.ta… BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel %if 0%{?suse_version} > 1210 @@ -104,6 +104,5 @@ %doc %lang(en) %{_kde4_htmldir}/en/kexi/ %doc %lang(en) %{_kde4_htmldir}/en/sheets/ %doc %lang(en) %{_kde4_htmldir}/en/stage/ -%doc %lang(en) %{_kde4_htmldir}/en/thesaurus/ %changelog ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.R2bkEw/_old 2012-10-03 07:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.R2bkEw/_new 2012-10-03 07:06:06.000000000 +0200 @@ -17,14 +17,14 @@ Name: calligra -Version: 2.4.3 +Version: 2.5.2 Release: 0 Summary: Libraries and Base Files for the Calligra Suite License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Url: http://www.calligra.org/ Source0: %{name}-%{version}.tar.bz2 -#Source0: ftp://ftp.kde.org/pub/kde/unstable/%{name}-%{version}/%{name}-%{version}.ta… +#Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}-%{version}/%{name}-%{version}.tar.… Source1: hi16-app-kexi.png Source2: hi22-app-kexi.png Source3: hi32-app-kexi.png @@ -32,8 +32,6 @@ Source5: hisc-app-kexi.svgz # PATCH-FIX-OPENSUSE remove_python_shebangs.patch asterios.dramis(a)gmail.com -- Remove python shebangs from various scripts (fixes rpmlint warning "non-executable-script") Patch0: remove_python_shebangs.patch -Patch1: bnc733534-calligra-msword-overflow-fix.diff -Patch2: calligra-marblewidget.patch BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel %if 0%{?suse_version} > 1210 @@ -59,9 +57,7 @@ BuildRequires: libkdcraw-devel BuildRequires: libkdepimlibs4-devel BuildRequires: liblcms-devel -%if 0%{?suse_version} > 1130 BuildRequires: liblcms2-devel -%endif BuildRequires: libmysqld-devel BuildRequires: libpoppler-qt4-devel BuildRequires: libpqxx-devel @@ -85,26 +81,29 @@ BuildRequires: pstoedit BuildRequires: sqlite-devel BuildRequires: xbase-devel -Recommends: kdepim4-runtime +BuildRequires: pkgconfig(glu) Recommends: %{name}-doc = %{version} +Recommends: kdepim4-runtime Suggests: calligra-braindump Suggests: calligra-flow Suggests: calligra-karbon Suggests: calligra-kexi Suggests: calligra-krita -Suggests: calligra-kthesaurus Suggests: calligra-plan -Suggests: calligra-stage Suggests: calligra-sheets +Suggests: calligra-stage Suggests: calligra-words +# calligra-kformula was last used at version 2.3.73 in KDE:Unstable:Playground +Provides: calligra-kformula = %{version} +Obsoletes: calligra-kformula < %{version} +# calligra-kthesaurus was last used at version 2.3.73 in KDE:Release:49 +Provides: calligra-kthesaurus = %{version} +Obsoletes: calligra-kthesaurus < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires Requires(post): shared-mime-info Requires(postun): shared-mime-info -# calligra-kformula was last used at version 2.3.73 in KDE:Unstable:Playground -Provides: calligra-kformula = %{version} -Obsoletes: calligra-kformula < %{version} %description The Calligra Suite is a set of applications that allows you to easily complete @@ -183,8 +182,6 @@ %description kexi Kexi is the database application of the Calligra Suite. -%if 0%{?suse_version} > 1140 - %package kexi-mssql-driver Summary: Database Application - MS SQL & Sybase Server driver License: GPL-2.0+ and LGPL-2.1+ @@ -195,7 +192,6 @@ Kexi is the database application of the Calligra Suite. This package contains Kexi MS SQL & Sybase Server driver. -%endif %package kexi-mysql-driver Summary: Database Application - MySQL driver @@ -246,25 +242,14 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} +Recommends: create-resources Requires(post): shared-mime-info Requires(postun): shared-mime-info -Recommends: create-resources %kde4_runtime_requires %description krita Krita is the image manipulation application of the Calligra Suite. -%package kthesaurus -Summary: Related Words Lookup -License: GPL-2.0+ and LGPL-2.1+ -Group: Productivity/Office/Suite -Requires: %{name} = %{version} -%kde4_runtime_requires - -%description kthesaurus -KThesaurus is the related words lookup application of the Calligra office -suite. - %package plan Summary: Project Management Application License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ @@ -319,8 +304,6 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -p1 %build %cmake_kde4 -d build -- -DBUILD_mobile=false -DBUILD_active=false -DIHAVEPATCHEDQT=TRUE @@ -356,8 +339,8 @@ rm -rf %{buildroot}%{_kde4_htmldir}/en/ # Do not use fdupes in %%{buildroot} as this causes icons in the calligra-package to be symlinks against the kexi-package, so that these are missing in krita (bnc#688012) -%fdupes -s %{buildroot}%{_datadir}/color/icc/krita/ -%fdupes -s %{buildroot}%{_datadir}/locale/ +%fdupes -s %{buildroot}%{_kde4_datadir}/color/icc/krita/ +%fdupes -s %{buildroot}%{_kde4_datadir}/locale/ %fdupes -s %{buildroot}%{_kde4_appsdir}/calligra/ %fdupes -s %{buildroot}%{_kde4_appsdir}/flow/stencils/ %fdupes -s %{buildroot}%{_kde4_appsdir}/kexi/ @@ -370,7 +353,6 @@ %suse_update_desktop_file -r karbon Qt KDE Graphics VectorGraphics %suse_update_desktop_file -r kexi Qt KDE Office Database %suse_update_desktop_file -r krita Qt KDE Graphics RasterGraphics -%suse_update_desktop_file -r KThesaurus Qt KDE Office Dictionary %suse_update_desktop_file -r plan Qt KDE Office ProjectManagement %suse_update_desktop_file -r planwork Qt KDE Office ProjectManagement %suse_update_desktop_file -r stage Qt KDE Office Presentation @@ -383,7 +365,6 @@ for i in {16,32,48,64}; do mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps cp -a %{_kde4_iconsdir}/oxygen/"$i"x"$i"/apps/kivio.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/; - cp -a %{_kde4_iconsdir}/oxygen/"$i"x"$i"/apps/kthesaurus.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/; done # Install hicolor application icons for kexi for i in {16,22,32,48}; do @@ -398,11 +379,19 @@ %post /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : + +%post krita +/sbin/ldconfig +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : + +%postun krita +/sbin/ldconfig +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %post braindump -p /sbin/ldconfig @@ -420,14 +409,6 @@ %postun kexi -p /sbin/ldconfig -%post krita -/sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : - -%postun krita -/sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : - %post plan -p /sbin/ldconfig %postun plan -p /sbin/ldconfig @@ -451,12 +432,12 @@ %files -f filelists/exclude %defattr(-,root,root,-) %doc COPYING COPYING.LIB README -%dir %{_datadir}/color -%dir %{_datadir}/color/icc +%dir %{_kde4_datadir}/color +%dir %{_kde4_datadir}/color/icc %dir %{_kde4_sharedir}/templates %dir %{_kde4_sharedir}/templates/.source -%{_datadir}/color/icc/pigment/ -%{_datadir}/mime/packages/msooxml-all.xml +%{_kde4_datadir}/color/icc/pigment/ +%{_kde4_datadir}/mime/packages/msooxml-all.xml %{_kde4_applicationsdir}/calligra.desktop %{_kde4_appsdir}/calligra/ %{_kde4_appsdir}/formulashape/ @@ -471,7 +452,10 @@ %dir %{_kde4_appsdir}/pigmentcms/ctlprofiles %dir %{_kde4_appsdir}/pigmentcms/ctltemplates %endif -%{_kde4_appsdir}/xsltfilter/ +%{_kde4_iconsdir}/oxygen/*/actions/curve-connector.* +%{_kde4_iconsdir}/oxygen/*/actions/insert-endnote.* +%{_kde4_iconsdir}/oxygen/*/actions/insert-footnote.* +%{_kde4_iconsdir}/oxygen/*/actions/lines-connector.* %{_kde4_iconsdir}/oxygen/*/actions/object-align-horizontal-center-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/object-align-horizontal-left-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/object-align-horizontal-right-calligra.* @@ -486,6 +470,8 @@ %{_kde4_iconsdir}/oxygen/*/actions/object-order-raise-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/object-ungroup-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/shape-choose.* +%{_kde4_iconsdir}/oxygen/*/actions/standard-connector.* +%{_kde4_iconsdir}/oxygen/*/actions/straight-connector.* %{_kde4_iconsdir}/oxygen/*/actions/table.* %{_kde4_iconsdir}/oxygen/*/actions/x-shape-chart.* %{_kde4_iconsdir}/oxygen/*/actions/x-shape-connection.* @@ -515,19 +501,15 @@ %{_kde4_modulesdir}/autocorrect.so %{_kde4_modulesdir}/calligradockers.so %{_kde4_modulesdir}/calligragoogledocs.so -%{_kde4_modulesdir}/calligrascan.so %{_kde4_modulesdir}/changecase.so %{_kde4_modulesdir}/chartshape.so %{_kde4_modulesdir}/commentshape.so %{_kde4_modulesdir}/defaulttools.so %{_kde4_modulesdir}/formulashape.so -%{_kde4_modulesdir}/generickofilter.so %{_kde4_modulesdir}/kodocinfopropspage.so %{_kde4_modulesdir}/kolcmsengine.so %{_kde4_modulesdir}/kopabackgroundtool.so %{_kde4_modulesdir}/koreport_*.so -%{_kde4_modulesdir}/kounavailpart.so -# %%{_kde4_modulesdir}/mapshape.so %{_kde4_modulesdir}/musicshape.so %{_kde4_modulesdir}/pathshapes.so %{_kde4_modulesdir}/pictureshape.so @@ -538,11 +520,9 @@ %{_kde4_modulesdir}/spellcheck.so %{_kde4_modulesdir}/textshape.so %{_kde4_modulesdir}/textvariables.so -%{_kde4_modulesdir}/treeshape.so +%{_kde4_modulesdir}/thesaurustool.so %{_kde4_modulesdir}/vectorshape.so %{_kde4_modulesdir}/videoshape.so -%{_kde4_modulesdir}/xsltexport.so -%{_kde4_modulesdir}/xsltimport.so %{_kde4_servicesdir}/artistictextshape.desktop %{_kde4_servicesdir}/autocorrect.desktop %{_kde4_servicesdir}/calligradockers.desktop @@ -551,7 +531,6 @@ %{_kde4_servicesdir}/commentshape.desktop %{_kde4_servicesdir}/defaulttools.desktop %{_kde4_servicesdir}/formulashape.desktop -%{_kde4_servicesdir}/generic_filter.desktop %{_kde4_servicesdir}/kchartpart.desktop %{_kde4_servicesdir}/kformulapart.desktop %{_kde4_servicesdir}/kodocinfopropspage.desktop @@ -561,8 +540,6 @@ %{_kde4_servicesdir}/koreport_chartplugin.desktop %{_kde4_servicesdir}/koreport_mapsplugin.desktop %{_kde4_servicesdir}/koreport_webplugin.desktop -%{_kde4_servicesdir}/kounavail.desktop -# %%{_kde4_servicesdir}/mapshape.desktop %{_kde4_servicesdir}/musicshape.desktop %{_kde4_servicesdir}/pathshapes.desktop %{_kde4_servicesdir}/pictureshape.desktop @@ -573,11 +550,9 @@ %{_kde4_servicesdir}/spellcheck.desktop %{_kde4_servicesdir}/textshape.desktop %{_kde4_servicesdir}/textvariables.desktop -%{_kde4_servicesdir}/treeshape.desktop +%{_kde4_servicesdir}/thesaurustool.desktop %{_kde4_servicesdir}/vectorshape.desktop %{_kde4_servicesdir}/videoshape.desktop -%{_kde4_servicesdir}/xslt_export.desktop -%{_kde4_servicesdir}/xslt_import.desktop %{_kde4_servicetypesdir}/calligra_application.desktop %{_kde4_servicetypesdir}/calligra_deferred_plugin.desktop %{_kde4_servicetypesdir}/calligradocker.desktop @@ -599,14 +574,6 @@ %{_kde4_servicetypesdir}/scripteventaction.desktop %{_kde4_servicetypesdir}/texteditingplugin.desktop %{_kde4_servicetypesdir}/textvariableplugin.desktop -# Included in kthesaurus package -%exclude %{_kde4_appsdir}/calligra/thesaurus/ - -%files braindump -f filelists/braindump -%defattr(-,root,root,-) -%doc braindump/COPYING -%dir %{_kde4_appsdir}/stateshape/ -%dir %{_kde4_appsdir}/stateshape/states %files devel -f filelists/devel %defattr(-,root,root,-) @@ -632,6 +599,12 @@ %{_kde4_libdir}/libpigmentcms.so %{_kde4_libdir}/libtextlayout.so +%files braindump -f filelists/braindump +%defattr(-,root,root,-) +%doc braindump/COPYING +%dir %{_kde4_appsdir}/stateshape/ +%dir %{_kde4_appsdir}/stateshape/states + %files flow -f filelists/flow %defattr(-,root,root,-) %doc flow/AUTHORS flow/CHANGELOG flow/CHANGES flow/LICENSE flow/NOTES flow/README @@ -641,8 +614,8 @@ %defattr(-,root,root,-) %doc karbon/AUTHORS karbon/CHANGES karbon/COPYING.LIB karbon/IDEAS karbon/README karbon/TODO %{_kde4_servicesdir}/ServiceMenus/karbon_konqi.desktop -%{_kde4_sharedir}/templates/.source/Illustration.karbon %{_kde4_sharedir}/templates/Illustration.desktop +%{_kde4_sharedir}/templates/.source/Illustration.odg %files kexi -f filelists/kexi %defattr(-,root,root,-) @@ -701,23 +674,11 @@ %files krita -f filelists/krita %defattr(-,root,root,-) %doc krita/AUTHORS krita/README -%dir %{_datadir}/color/icc/krita/ +%dir %{_kde4_datadir}/color/icc/krita/ %dir %{_kde4_appsdir}/kritaplugins/ %dir %{_kde4_appsdir}/kritaplugins/metadataeditor -%{_kde4_appsdir}/krita/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/krita_konqi.desktop -%files kthesaurus -%defattr(-,root,root,-) -%doc tools/kthesaurus/README -%{_kde4_applicationsdir}/KThesaurus.desktop -%{_kde4_appsdir}/calligra/thesaurus/ -%{_kde4_bindir}/kthesaurus -%{_kde4_iconsdir}/hicolor/*/apps/kthesaurus.* -%{_kde4_libdir}/libkdeinit4_kthesaurus.so -%{_kde4_modulesdir}/thesaurustool.so -%{_kde4_servicesdir}/thesaurustool.desktop - %files plan -f filelists/plan %defattr(-,root,root,-) %doc plan/CHANGELOG plan/TODO plan/examples/ @@ -730,22 +691,20 @@ %doc stage/AUTHORS stage/CHANGES stage/TODO %{_kde4_appsdir}/stage/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/kpresenter_konqi.desktop -%{_kde4_sharedir}/templates/.source/Presentation.kpt %{_kde4_sharedir}/templates/Presentation.desktop +%{_kde4_sharedir}/templates/.source/Presentation.odp %files sheets -f filelists/sheets %defattr(-,root,root,-) %doc sheets/AUTHORS sheets/CHANGES sheets/README sheets/TODO -%{_kde4_sharedir}/templates/SpreadSheet.desktop -%{_kde4_sharedir}/templates/.source/SpreadSheet.kst +%{_kde4_appsdir}/tables/ +%{_kde4_appsdir}/tables/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/kspread_konqi.desktop +%{_kde4_sharedir}/templates/SpreadSheet.desktop +%{_kde4_sharedir}/templates/.source/SpreadSheet.ods %files tools -f filelists/tools %defattr(-,root,root,-) -# Included in kthesaurus package -%exclude %{_kde4_applicationsdir}/KThesaurus.desktop -%exclude %{_kde4_bindir}/kthesaurus -%exclude %{_kde4_libdir}/libkdeinit4_kthesaurus.so # Included in karbon, stage, krita, sheets, words packages %exclude %{_kde4_servicesdir}/ServiceMenus/karbon_konqi.desktop %exclude %{_kde4_servicesdir}/ServiceMenus/kpresenter_konqi.desktop @@ -758,7 +717,7 @@ %dir %{_kde4_appsdir}/words/html-odf %{_kde4_appsdir}/words/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/words_konqi.desktop -%{_kde4_sharedir}/templates/.source/TextDocument.kwt %{_kde4_sharedir}/templates/TextDocument.desktop +%{_kde4_sharedir}/templates/.source/TextDocument.odt %changelog ++++++ calligra-2.4.3.tar.bz2 -> calligra-2.5.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.4.3.tar.bz2 /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.5.2.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 at-spi2-core for openSUSE:Factory
by root＠hilbert.suse.de 03 Oct '12

03 Oct '12

Hello community, here is the log from the commit of package at-spi2-core for openSUSE:Factory checked in at 2012-10-03 07:05:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-core (Old) and /work/SRC/openSUSE:Factory/.at-spi2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at-spi2-core", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-core/at-spi2-core.changes 2012-05-22 10:08:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at-spi2-core.new/at-spi2-core.changes 2012-10-03 07:05:02.000000000 +0200 @@ -1,0 +2,62 @@ +Tue Sep 25 06:44:09 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.6.0: + + Stable release - No changes compared to 2.5.92. + +------------------------------------------------------------------- +Tue Sep 18 14:35:19 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 2.5.92: + + Fix some annotations. + + Exit, rather than crash, when unable to open an X display + (bgo#660407). + + Fix various memory leaks (bgo#684033). + +------------------------------------------------------------------- +Tue Sep 4 08:15:21 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.5.91: + + Fix build with -fno-common. + + Add glib-2.0 to requires in at-spi2.pc (bgo#682595). + +------------------------------------------------------------------- +Mon Aug 6 21:53:39 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.5.5: + + Add atspi_action_get_localized_name (bgo#680598). + + Allow building from out of source directory (bgo#680281). + +------------------------------------------------------------------- +Tue Jul 17 18:22:55 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.5.4: + + Fix a missing return value. + + Fix a crash when unable to remove a match rule. + +------------------------------------------------------------------- +Tue Jun 26 07:21:20 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.5.3: + + Fix a memory leak (bgo#678738). + +------------------------------------------------------------------- +Mon Jun 18 17:29:38 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.5.2: + + Fix a crash when a call to fetch a hyperlink times out. + + Fix C++ compilation. + + Remove a warning that was sometimes logged when a method call + timed out. + + Fix crash in atspi_deregister_keystroke_listener (fdo#50578) + +------------------------------------------------------------------- +Thu May 17 20:54:47 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 2.5.1: + + Add atspi_set_timeout. + + By default, disable method call timeouts until an application + has been on the bus for 15 seconds. This behavior can be + changed with a call to atspi_set_timeout. + + Fix GError sent when receiving a reply of the wrong type. + +------------------------------------------------------------------- Old: ---- at-spi2-core-2.4.2.tar.xz New: ---- at-spi2-core-2.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-core.spec ++++++ --- /var/tmp/diff_new_pack.kmAe58/_old 2012-10-03 07:05:03.000000000 +0200 +++ /var/tmp/diff_new_pack.kmAe58/_new 2012-10-03 07:05:03.000000000 +0200 @@ -17,13 +17,13 @@ Name: at-spi2-core -Version: 2.4.2 +Version: 2.6.0 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: GPL-2.0+ Group: System/Libraries Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/at-spi2-core/2.4/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/at-spi2-core/2.6/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0