March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit aria2 for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package aria2 for openSUSE:Factory checked in at Sat Mar 7 11:41:32 CET 2009. -------- --- aria2/aria2.changes 2009-02-16 19:47:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/aria2/aria2.changes 2009-03-06 16:56:48.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 6 16:56:02 CET 2009 - poeml(a)suse.de + +- add patch for failing download when the adaptive URI selector is + used (https://sourceforge.net/support/tracker.php?aid=2666026) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- adaptiveuriselector.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aria2.spec ++++++ --- /var/tmp/diff_new_pack.M16168/_old 2009-03-07 11:41:21.000000000 +0100 +++ /var/tmp/diff_new_pack.M16168/_new 2009-03-07 11:41:21.000000000 +0100 @@ -30,7 +30,7 @@ Name: aria2 Version: 1.2.0 -Release: 1 +Release: 2 #define pkg_version %{version} %define pkg_version 1.2.0 Summary: Metalink client for the command line. @@ -39,6 +39,7 @@ Patch2: aria2-cares-lib64.patch Patch3: aria2-no-uint64.patch Patch4: aria2-atoi.patch +Patch5: adaptiveuriselector.patch Url: http://aria2.sourceforge.net/ Group: Productivity/Networking/Other License: GPL v2 only @@ -111,6 +112,7 @@ %endif %endif %patch4 +%patch5 %build export CFLAGS="%{optflags} -fPIC" @@ -152,6 +154,9 @@ %doc %{_mandir}/man1/aria2c.1* %changelog +* Fri Mar 06 2009 poeml(a)suse.de +- add patch for failing download when the adaptive URI selector is + used (https://sourceforge.net/support/tracker.php?aid=2666026) * Mon Feb 16 2009 poeml(a)suse.de - update to 1.2.0 release The list of changes is mainly as given below, plus bugfixes. ++++++ adaptiveuriselector.patch ++++++ Index: src/AdaptiveURISelector.cc =================================================================== --- src/AdaptiveURISelector.cc (revision 1084) +++ src/AdaptiveURISelector.cc (working copy) @@ -151,35 +151,45 @@ } else { /* Here we return a mirror which need to be tested again */ std::string toReTest = getFirstToTestUri(uris); - _logger->debug("AdaptiveURISelector: choosing mirror %s which has not" - " been tested recently for connection #%d", - toReTest.c_str(), _nbConnections); - return toReTest; + if(toReTest != A2STR::NIL) { + _logger->debug("AdaptiveURISelector: choosing mirror %s which has not" + " been tested recently for connection #%d", + toReTest.c_str(), _nbConnections); + return toReTest; + } else { + return getBestMirror(uris); + } } } else { - /* Here we return one of the bests mirrors */ - unsigned int max = getMaxDownloadSpeed(uris); - unsigned int min = max-(int)(max*0.25); - std::deque<std::string> bests = getUrisBySpeed(uris, min); - - if (bests.size() < 2) { - std::string uri = getMaxDownloadSpeedUri(uris); - _logger->debug("AdaptiveURISelector: choosing the best mirror :" - " %.2fKB/s %s (other mirrors are at least 25%% slower)", - (float) max/1024, uri.c_str()); - return uri; - } else { - std::string uri = selectRandomUri(bests); - _logger->debug("AdaptiveURISelector: choosing randomly one of the best" - " mirrors (range [%.2fKB/s, %.2fKB/s]): %s", - (float) min/1024, (float) max/1024, uri.c_str()); - return uri; - } + return getBestMirror(uris); } } } +std::string AdaptiveURISelector::getBestMirror +(const std::deque<std::string>& uris) const +{ + /* Here we return one of the bests mirrors */ + unsigned int max = getMaxDownloadSpeed(uris); + unsigned int min = max-(int)(max*0.25); + std::deque<std::string> bests = getUrisBySpeed(uris, min); + + if (bests.size() < 2) { + std::string uri = getMaxDownloadSpeedUri(uris); + _logger->debug("AdaptiveURISelector: choosing the best mirror :" + " %.2fKB/s %s (other mirrors are at least 25%% slower)", + (float) max/1024, uri.c_str()); + return uri; + } else { + std::string uri = selectRandomUri(bests); + _logger->debug("AdaptiveURISelector: choosing randomly one of the best" + " mirrors (range [%.2fKB/s, %.2fKB/s]): %s", + (float) min/1024, (float) max/1024, uri.c_str()); + return uri; + } +} + void AdaptiveURISelector::resetCounters() { const Option* op = _requestGroup->getOption(); Index: src/AdaptiveURISelector.h =================================================================== --- src/AdaptiveURISelector.h (revision 1084) +++ src/AdaptiveURISelector.h (working copy) @@ -70,6 +70,7 @@ std::string getFirstToTestUri(const std::deque<std::string>& uris) const; SharedHandle<ServerStat> getServerStats(const std::string& uri) const; unsigned int getNbTestedServers(const std::deque<std::string>& uris) const; + std::string getBestMirror(const std::deque<std::string>& uris) const; public: AdaptiveURISelector(const SharedHandle<ServerStatMan>& serverStatMan, const SharedHandle<RequestGroup>& requestGroup); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde-susetranslations for openSUSE:Factory
by root＠Hilbert.suse.de 06 Mar '09

06 Mar '09

Hello community, here is the log from the commit of package kde-susetranslations for openSUSE:Factory checked in at Fri Mar 6 15:19:16 CET 2009. -------- --- KDE/kde-susetranslations/kde-susetranslations.changes 2009-01-13 15:25:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde-susetranslations/kde-susetranslations.changes 2009-03-06 14:56:53.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 6 14:56:32 CET 2009 - coolo(a)suse.de + +- NM-kde4-lang is built from NM-kde4 now + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-susetranslations.spec ++++++ --- /var/tmp/diff_new_pack.a10893/_old 2009-03-06 15:18:47.000000000 +0100 +++ /var/tmp/diff_new_pack.a10893/_new 2009-03-06 15:18:47.000000000 +0100 @@ -25,7 +25,7 @@ Summary: SUSE KDE Translations BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.1 -Release: 12 +Release: 15 # https://svn.suse.de/svn/desktop/trunk/kde-susetranslations/update_rpm Source0: kde-susetranslations.tar.bz2 Source1: COPYING @@ -50,25 +50,6 @@ Oliver Ries <ories(a)suse.de> Ludwig Nussel <lnussel(a)suse.de> -%package -n NetworkManager-kde4-lang -License: GPL v2 or later -Summary: Languages for package NetworkManager-kde4 -Group: System/Localization -%define nversion 0.7 -Requires: NetworkManager-kde4 = %nversion -Provides: NetworkManager-kde4-lang = %nversion -Provides: NetworkManager-kde4-lang-all = %nversion -Supplements: packageand(bundle-lang-other:NetworkManager-kde4) - -%description -n NetworkManager-kde4-lang -Provides translations to the package NetworkManager-kde4 - - - -Authors: --------- - Will Stephenson <wstephenson(a)novell.com> - %package -n PolicyKit-kde-lang License: GPL v2 or later Summary: Languages for package PolicyKit-kde @@ -120,11 +101,11 @@ %makeinstall cd .. %find_lang susetranslations susetranslations.lang - %find_lang kcm_knetworkmanager networkmanager.lang - %find_lang plasma_applet_networkmanager networkmanager.lang %find_lang policykit-kde policykit.lang %find_lang simple-ccsm-kde simple-ccsm-kde.lang install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/doc/packages/kde-susetranslations/COPYING + rm $RPM_BUILD_ROOT/usr/share/locale/*/LC_MESSAGES/kcm_knetworkmanager.mo + rm $RPM_BUILD_ROOT/usr/share/locale/*/LC_MESSAGES/plasma_applet_networkmanager.mo %files -f susetranslations.lang %defattr(-,root,root) @@ -136,10 +117,9 @@ %files -n PolicyKit-kde-lang -f policykit.lang %defattr(-,root,root) -%files -n NetworkManager-kde4-lang -f networkmanager.lang -%defattr(-,root,root) - %changelog +* Fri Mar 06 2009 coolo(a)suse.de +- NM-kde4-lang is built from NM-kde4 now * Tue Jan 13 2009 stbinner(a)suse.de - switch back to trunk translations by openSUSE * Mon Jan 12 2009 stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit suspend for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at Fri Mar 6 00:26:34 CET 2009. -------- --- suspend/suspend.changes 2008-11-07 10:15:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/suspend/suspend.changes 2009-02-23 19:44:35.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 23 19:40:15 CET 2009 - poeml(a)suse.de + +- provide a way to prevent recreation of initial ramdisks on + install/update, and add a note to %post about it (bnc#381276) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.Mp2158/_old 2009-03-06 00:25:51.000000000 +0100 +++ /var/tmp/diff_new_pack.Mp2158/_new 2009-03-06 00:25:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package suspend (Version 0.80.MACRO) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -128,6 +128,13 @@ %post %if 0%{?suse_version} > 1100 +if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then + echo "Skipping recreation of existing initial ramdisks, due" + echo "to presence of /var/lib/no_initrd_recreation_by_suspend" + exit 0 +fi +echo "Recreating all initial ramdiscs. This could take a while." +echo "(Touch /var/lib/no_initrd_recreation_by_suspend to prevent.)" if [ -x /sbin/mkinitrd_setup ] ; then mkinitrd_setup fi @@ -142,6 +149,11 @@ %if 0%{?suse_version} > 1100 %postun +if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then + echo "Skipping recreation of existing initial ramdisks, due" + echo "to presence of /var/lib/no_initrd_recreation_by_suspend" + exit 0 +fi if [ -x /sbin/mkinitrd_setup ] ; then mkinitrd_setup fi @@ -170,6 +182,9 @@ %endif %changelog +* Mon Feb 23 2009 poeml(a)suse.de +- provide a way to prevent recreation of initial ramdisks on + install/update, and add a note to %%post about it (bnc#381276) * Fri Nov 07 2008 seife(a)suse.de - update to current CVS: - whitelist update, add 4 HP workstations (bnc#436284) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevplatform for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Fri Mar 6 00:24:32 CET 2009. -------- --- KDE/kdevplatform/kdevplatform.changes 2009-02-04 18:15:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2009-03-05 19:02:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 5 19:02:45 CET 2009 - coolo(a)suse.de + +- fix file list + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.S30821/_old 2009-03-06 00:24:17.000000000 +0100 +++ /var/tmp/diff_new_pack.S30821/_new 2009-03-06 00:24:17.000000000 +0100 @@ -24,7 +24,7 @@ Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org Version: 0.9.91 -Release: 1 +Release: 2 Source0: kdevplatform-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -107,7 +107,7 @@ %_libdir/libkdevplatformvcs.so %_libdir/libsublime.so %_libdir/libkdevplatformtestshell.so -%_libdir/kdevplatform +%_libdir/cmake %package -n libkdevplatform0 License: GPL v2 or later @@ -222,6 +222,8 @@ %_kde_share_dir/services/kdevappwizard.desktop %changelog +* Thu Mar 05 2009 coolo(a)suse.de +- fix file list * Wed Feb 04 2009 dmueller(a)suse.de - update to 0.9.91 * Wed Jan 14 2009 stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Fri Mar 6 00:24:09 CET 2009. -------- --- installation-images/installation-images.changes 2009-03-05 15:54:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2009-03-05 20:34:48.526622000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 5 20:34:25 CET 2009 - coolo(a)suse.de + +- readline5 is now readline6, sonst ändert sich nix + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.o28257/_old 2009-03-06 00:23:46.000000000 +0100 +++ /var/tmp/diff_new_pack.o28257/_new 2009-03-06 00:23:46.000000000 +0100 @@ -100,7 +100,7 @@ AutoReqProv: off Summary: Installation Image Files Version: 12.2 -Release: 9 +Release: 10 Source: installation-images-12.2.tar.bz2 Patch1: installation-images-12.2-s390x-tapeipl-rename.diff Patch2: installation-images-12.2.dif @@ -120,7 +120,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 533 +Release: 534 PreReq: /bin/ln %description -n install-initrd @@ -268,6 +268,8 @@ %ghost /usr/lib/install-initrd/branding %changelog +* Thu Mar 05 2009 coolo(a)suse.de +- readline5 is now readline6, sonst ändert sich nix * Thu Mar 05 2009 ro(a)suse.de - disable tightvnc for the moment * Sun Mar 01 2009 coolo(a)suse.de ++++++ installation-images-12.2.dif ++++++ --- /var/tmp/diff_new_pack.o28257/_old 2009-03-06 00:23:46.000000000 +0100 +++ /var/tmp/diff_new_pack.o28257/_new 2009-03-06 00:23:46.000000000 +0100 @@ -2,6 +2,15 @@ =================================================================== --- data/root/root.file_list.orig +++ data/root/root.file_list +@@ -48,7 +48,7 @@ bash: + /bin/bash + s bash /bin/sh + +-libreadline5: ++libreadline6: + /lib*/libreadline.so.* + /lib*/libhistory.so.* + @@ -753,7 +753,7 @@ xz: /usr/bin/xzdec @@ -40,6 +49,15 @@ module-init-tools: /etc/modprobe.conf /etc/modprobe.conf.local +@@ -465,7 +474,7 @@ bash: + /bin/{sh,bash} + s bash /bin/lsh + +-libreadline5: ++libreadline6: + /lib*/libreadline.so* + /lib*/libhistory.so* + @@ -637,8 +646,6 @@ bind-utils: bind-libs: /usr/lib* @@ -53,6 +71,15 @@ =================================================================== --- data/rescue/rescue.file_list.orig +++ data/rescue/rescue.file_list +@@ -70,7 +70,7 @@ star: + bash: + /bin + +-libreadline5: ++libreadline6: + /lib* + + cpio: @@ -164,6 +164,9 @@ libselinux1: libsepol1: / @@ -67,6 +94,15 @@ =================================================================== --- data/base/base.file_list.orig +++ data/base/base.file_list +@@ -40,7 +40,7 @@ tar: + bash: + /bin + +-libreadline5: ++libreadline6: + /lib* + + coreutils: @@ -55,6 +55,12 @@ libselinux1: libsepol1: / @@ -80,3 +116,51 @@ libexpat1: /lib*/libexpat.so.* +Index: data/initrd/zeninitrd_base.file_list +=================================================================== +--- data/initrd/zeninitrd_base.file_list.orig ++++ data/initrd/zeninitrd_base.file_list +@@ -171,7 +171,7 @@ sed: + #! gdb: + #! m /usr/bin/gdb /bin/gdb + +- libreadline5: ++ libreadline6: + /lib*/libreadline.so* + /lib*/libhistory.so* + +@@ -274,7 +274,7 @@ bash: + s bash /bin/lsh + s bash /bin/ash + +-libreadline5: ++libreadline6: + /lib*/libreadline.so* + /lib*/libhistory.so* + +Index: data/rescue/hal.file_list +=================================================================== +--- data/rescue/hal.file_list.orig ++++ data/rescue/hal.file_list +@@ -11,7 +11,7 @@ devs: + bash: + /bin + +-libreadline5: ++libreadline6: + /lib* + + glibc: +Index: data/root/zenroot.file_list +=================================================================== +--- data/root/zenroot.file_list.orig ++++ data/root/zenroot.file_list +@@ -55,7 +55,7 @@ bash: + s bash /bin/sh + s bash /bin/ash + +-libreadline5: ++libreadline6: + /lib*/libreadline.so.* + /lib*/libhistory.so.* + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdm for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at Fri Mar 6 00:23:35 CET 2009. -------- --- GNOME/gdm/gdm.changes 2009-02-23 05:03:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2009-03-05 16:25:56.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 5 16:24:33 CET 2009 - vuntz(a)novell.com + +- Add gdm-gconf-path.patch: the system-wide changes done in gconf + are not in gconf.xml.system, but gconf.xml.defaults. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gdm-gconf-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.R27127/_old 2009-03-06 00:23:23.000000000 +0100 +++ /var/tmp/diff_new_pack.R27127/_new 2009-03-06 00:23:23.000000000 +0100 @@ -47,7 +47,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.25.2 -Release: 2 +Release: 3 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -92,6 +92,8 @@ Patch29: gdm-bnc468374-dbus-send-dest.patch # PATCH-FIX-UPSTREAM gdm-dbus-allow-introspection.patch bnc473880 bgo572214 vuntz(a)novell.com -- Patch by thoenig to allow introspection of the dbus service Patch30: gdm-dbus-allow-introspection.patch +# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz(a)novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE +Patch31: gdm-gconf-path.patch # PATCH-SUSE: enable SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -176,6 +178,7 @@ %patch28 %patch29 -p1 %patch30 -p1 +%patch31 -p1 %patch60 gnome-patch-translation-update @@ -283,6 +286,9 @@ %files lang -f %{name}.lang %changelog +* Thu Mar 05 2009 vuntz(a)novell.com +- Add gdm-gconf-path.patch: the system-wide changes done in gconf + are not in gconf.xml.system, but gconf.xml.defaults. * Mon Feb 23 2009 vuntz(a)novell.com - Update gdm-domain-logon.patch: add new files in POTFILES.in. Thanks to Stanislav Brabec for spotting this! ++++++ gdm-gconf-path.patch ++++++ Index: gdm-2.25.2/data/gconf.path =================================================================== --- gdm-2.25.2.orig/data/gconf.path +++ gdm-2.25.2/data/gconf.path @@ -1,5 +1,5 @@ # treat system-wide settings as mandatory -xml:readonly:/etc/gconf/gconf.xml.system +xml:readonly:/etc/gconf/gconf.xml.defaults # override some settings # we treat settings in this location as ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cups-pk-helper for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package cups-pk-helper for openSUSE:Factory checked in at Fri Mar 6 00:23:13 CET 2009. -------- --- cups-pk-helper/cups-pk-helper.changes 2009-02-21 23:48:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups-pk-helper/cups-pk-helper.changes 2009-03-04 13:55:55.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Mar 4 13:54:05 CET 2009 - vuntz(a)novell.com + +- Update to version 0.0.4: + + Remove bare send_interface lines in the DBus rules. + + Add job related functions. + + Reconnect to the cups server if necessary. + + Accept file: URI as local. + + Change default policy for job-edit to yes (jobs are owned by + the user). + + Add more checks for the new job-related functions. + + Code cleanups. +- Drop cups-pk-helper-bnc468389-dbus-send-dest.patch: fixed + upstream. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cups-pk-helper-0.0.3.tar.bz2 cups-pk-helper-bnc468389-dbus-send-dest.patch New: ---- cups-pk-helper-0.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-pk-helper.spec ++++++ --- /var/tmp/diff_new_pack.m26440/_old 2009-03-06 00:23:06.000000000 +0100 +++ /var/tmp/diff_new_pack.m26440/_new 2009-03-06 00:23:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cups-pk-helper (Version 0.0.3) +# spec file for package cups-pk-helper (Version 0.0.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,11 @@ Name: cups-pk-helper License: GPL v2 or later Group: Hardware/Printing -Version: 0.0.3 -Release: 2 +Version: 0.0.4 +Release: 1 Summary: PolicyKit helper to configure cups with fine-grained privileges Url: http://www.vuntz.net/download/cups-pk-helper/ Source0: http://www.vuntz.net/download/cups-pk-helper/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM cups-pk-helper-bnc468389-dbus-send-dest.patch bnc468389 vuntz(a)novell.com -- Fix the potential dbus security issue with send_interface -Patch0: cups-pk-helper-bnc468389-dbus-send-dest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PolicyKit-devel BuildRequires: cups-devel @@ -51,7 +49,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --libexecdir=%{_libdir}/cups-pk-helper @@ -72,5 +69,17 @@ %{_datadir}/PolicyKit/policy/org.opensuse.cupspkhelper.mechanism.policy %changelog +* Wed Mar 04 2009 vuntz(a)novell.com +- Update to version 0.0.4: + + Remove bare send_interface lines in the DBus rules. + + Add job related functions. + + Reconnect to the cups server if necessary. + + Accept file: URI as local. + + Change default policy for job-edit to yes (jobs are owned by + the user). + + Add more checks for the new job-related functions. + + Code cleanups. +- Drop cups-pk-helper-bnc468389-dbus-send-dest.patch: fixed + upstream. * Sat Feb 21 2009 vuntz(a)novell.com - Split from system-config-printer. ++++++ cups-pk-helper-0.0.3.tar.bz2 -> cups-pk-helper-0.0.4.tar.bz2 ++++++ ++++ 17235 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/configure.ac new/cups-pk-helper-0.0.4/configure.ac --- old/cups-pk-helper-0.0.3/configure.ac 2008-11-21 07:33:43.000000000 +0100 +++ new/cups-pk-helper-0.0.4/configure.ac 2009-03-04 13:43:52.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([cups-pk-helper], [0.0.3], +AC_INIT([cups-pk-helper], [0.0.4], [https://bugzilla.novell.com/enter_bug.cgi?classification=7340&product=openS…]) AC_CONFIG_SRCDIR(src/cups-pk-helper-mechanism.c) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/NEWS new/cups-pk-helper-0.0.4/NEWS --- old/cups-pk-helper-0.0.3/NEWS 2008-11-21 07:36:52.000000000 +0100 +++ new/cups-pk-helper-0.0.4/NEWS 2009-03-04 13:48:25.000000000 +0100 @@ -1,4 +1,16 @@ ============= +Version 0.0.4 +============= + ++ Remove bare send_interface lines in the DBus rules. ++ Add job related functions. (Marek Kasik) ++ Reconnect to the cups server if necessary. (Marek Kasik) ++ Accept file: URI as local. (Marek Kasik) ++ Change default policy for job-edit to yes (jobs are owned by the user). ++ Add more checks for the new job-related functions. ++ Code cleanups. + +============= Version 0.0.3 ============= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/po/Makefile.in.in new/cups-pk-helper-0.0.4/po/Makefile.in.in --- old/cups-pk-helper-0.0.3/po/Makefile.in.in 2008-11-17 16:58:23.000000000 +0100 +++ new/cups-pk-helper-0.0.4/po/Makefile.in.in 2009-03-04 13:50:25.000000000 +0100 @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/cups.c new/cups-pk-helper-0.0.4/src/cups.c --- old/cups-pk-helper-0.0.3/src/cups.c 2008-11-21 07:04:28.000000000 +0100 +++ new/cups-pk-helper-0.0.4/src/cups.c 2009-03-04 13:41:53.000000000 +0100 @@ -45,6 +45,12 @@ #include "cups.h" +/* This is 0.1 second */ +#define RECONNECT_DELAY 100000 +/* We try to reconnect during 3 seconds. It's still a fairly long time even for + * restarting cups, so it should be fine */ +#define MAX_RECONNECT_ATTEMPTS 30 + /* getPrinters getDests @@ -55,11 +61,11 @@ getDevices getJobs getJobAttributes - ! cancelJob +~!+* cancelJob ! cancelAllJobs ! authenticateJob - ! setJobHoldUntil - ! restartJob +~!+* setJobHoldUntil +~!+* restartJob ~!+* getFile ~!+* putFile ~!+* addPrinter @@ -174,6 +180,25 @@ cups->priv->internal_status = NULL; } +static gboolean +cph_cups_reconnect (CphCups *cups) +{ + int return_value = -1; + int i; + + for (i = 0; i < MAX_RECONNECT_ATTEMPTS; i++) { + return_value = httpReconnect (cups->priv->connection); + if (return_value == 0) + break; + g_usleep (RECONNECT_DELAY); + } + + if (return_value == 0) + return TRUE; + else + return FALSE; +} + static void cph_cups_finalize (GObject *object) { @@ -297,6 +322,22 @@ return FALSE; } +static gboolean +_cph_cups_is_job_id_valid (CphCups *cups, + int job_id) +{ + char *error; + + if (job_id > 0) + return TRUE; + + error = g_strdup_printf ("\"%d\" is not a valid job id.", job_id); + _cph_cups_set_internal_status (cups, error); + g_free (error); + + return FALSE; +} + /* This is some text, but we could potentially do more checks. We don't do them * because cups will already do them. * + for the URI, we could check that the scheme is supported and that the @@ -342,6 +383,7 @@ _CPH_CUPS_IS_VALID (info, "description", FALSE) _CPH_CUPS_IS_VALID (location, "location", FALSE) _CPH_CUPS_IS_VALID (reject_jobs_reason, "reason", FALSE) +_CPH_CUPS_IS_VALID (job_hold_until, "job hold until", FALSE) /* For put/get file: this is some text, but we could potentially do more * checks. We don't do them because cups will already do them. @@ -365,7 +407,7 @@ g_snprintf (uri, sizeof (uri), "ipp://localhost/printers/%s", name); ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, uri); + "printer-uri", NULL, uri); } static void @@ -377,7 +419,19 @@ g_snprintf (uri, sizeof (uri), "ipp://localhost/classes/%s", name); ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, uri); + "printer-uri", NULL, uri); +} + +static void +_cph_cups_add_job_uri (ipp_t *request, + int job_id) +{ + char uri[HTTP_MAX_URI + 1]; + + g_snprintf (uri, sizeof (uri), + "ipp://localhost/jobs/%d", job_id); + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, + "job-uri", NULL, uri); } static void @@ -433,8 +487,7 @@ static const char * _cph_cups_get_resource (CphResource resource) { - switch (resource) - { + switch (resource) { case CPH_RESOURCE_ROOT: return "/"; case CPH_RESOURCE_ADMIN: @@ -541,6 +594,51 @@ return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } +static gboolean +_cph_cups_send_new_simple_job_request (CphCups *cups, + ipp_op_t op, + int job_id, + const char *user_name, + CphResource resource) +{ + ipp_t *request; + + request = ippNewRequest (op); + _cph_cups_add_job_uri (request, job_id); + + if (user_name != NULL) + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME, + "requesting-user-name", NULL, user_name); + + return _cph_cups_send_request (cups, request, resource); +} + +static gboolean +_cph_cups_send_new_job_attributes_request (CphCups *cups, + int job_id, + const char *name, + const char *value, + const char *user_name, + CphResource resource) +{ + cups_option_t *options = NULL; + ipp_t *request; + int num_options = 0; + + request = ippNewRequest (IPP_SET_JOB_ATTRIBUTES); + _cph_cups_add_job_uri (request, job_id); + + if (user_name != NULL) + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME, + "requesting-user-name", NULL, user_name); + + num_options = cupsAddOption (name, value, + num_options, &options); + cupsEncodeOptions (request, num_options, options); + + return _cph_cups_send_request (cups, request, resource); +} + static int _cph_cups_class_has_printer (CphCups *cups, const char *class_name, @@ -692,7 +790,7 @@ request = ippNewRequest (IPP_GET_PRINTER_ATTRIBUTES); _cph_cups_add_class_uri (request, name); ippAddStrings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", 1, NULL, attrs); + "requested-attributes", 1, NULL, attrs); resource_char = _cph_cups_get_resource (CPH_RESOURCE_ROOT); reply = cupsDoRequest (cups->priv->connection, @@ -731,7 +829,7 @@ request = ippNewRequest (IPP_GET_PRINTER_ATTRIBUTES); _cph_cups_add_printer_uri (request, printer_name); ippAddStrings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", 1, NULL, attrs); + "requested-attributes", 1, NULL, attrs); resource_char = _cph_cups_get_resource (CPH_RESOURCE_ROOT); reply = cupsDoRequest (cups->priv->connection, @@ -801,6 +899,10 @@ const char *resource, const char *filename) { + struct stat file_stat; + uid_t uid; + gid_t gid; + g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE); if (!_cph_cups_is_resource_valid (cups, resource)) @@ -808,12 +910,35 @@ if (!_cph_cups_is_filename_valid (cups, filename)) return FALSE; + stat (filename, &file_stat); + uid = file_stat.st_uid; + gid = file_stat.st_gid; + /* reset the internal status: we'll use the cups status */ _cph_cups_set_internal_status (cups, NULL); cups->priv->last_status = cupsGetFile (cups->priv->connection, resource, filename); + /* FIXME: There's a bug where the cups connection can fail with EPIPE. + * We're work-arounding it here until it's fixed in cups. */ + if (cups->priv->last_status != HTTP_OK) { + if (cph_cups_reconnect (cups)) { + int fd; + + /* if cupsGetFile fail, then filename is unlinked */ + fd = open (filename, O_CREAT, S_IRUSR | S_IWUSR); + close (fd); + chown (filename, uid, gid); + + _cph_cups_set_internal_status (cups, NULL); + + cups->priv->last_status = cupsGetFile (cups->priv->connection, + resource, + filename); + } + } + return cups->priv->last_status == HTTP_OK; } @@ -835,10 +960,15 @@ cups->priv->last_status = cupsPutFile (cups->priv->connection, resource, filename); + /* CUPS is being restarted, so we need to reconnect */ + cph_cups_reconnect (cups); + return (cups->priv->last_status == HTTP_OK || cups->priv->last_status == HTTP_CREATED); } +/* Functions that work on a printer */ + gboolean cph_cups_printer_add (CphCups *cups, const char *printer_name, @@ -1283,7 +1413,7 @@ request = ippNewRequest (CUPS_ADD_MODIFY_PRINTER); _cph_cups_add_printer_uri (request, printer_name); ippAddStrings (request, IPP_TAG_PRINTER, IPP_TAG_NAME, - "job-sheets-default", 2, NULL, values); + "job-sheets-default", 2, NULL, values); if (_cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN)) return TRUE; @@ -1295,7 +1425,7 @@ request = ippNewRequest (CUPS_ADD_MODIFY_CLASS); _cph_cups_add_class_uri (request, printer_name); ippAddStrings (request, IPP_TAG_PRINTER, IPP_TAG_NAME, - "job-sheets-default", 2, NULL, values); + "job-sheets-default", 2, NULL, values); return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } @@ -1494,6 +1624,8 @@ return retval; } +/* Functions that are for the server in general */ + GHashTable * cph_cups_server_get_settings (CphCups *cups) { @@ -1566,6 +1698,9 @@ retval = cupsAdminSetServerSettings (cups->priv->connection, num_settings, cups_settings); + /* CUPS is being restarted, so we need to reconnect */ + cph_cups_reconnect (cups); + cupsFreeOptions (num_settings, cups_settings); if (retval == 0) { @@ -1581,6 +1716,97 @@ return TRUE; } +/* Functions that work on jobs */ + +gboolean +cph_cups_job_cancel (CphCups *cups, + int job_id, + const char *user_name) +{ + g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE); + + if (!_cph_cups_is_job_id_valid (cups, job_id)) + return FALSE; + /* we don't check if the user name is valid or not because it comes + * from getpwuid(), and not dbus */ + + return _cph_cups_send_new_simple_job_request (cups, IPP_CANCEL_JOB, + job_id, + user_name, + CPH_RESOURCE_JOBS); +} + +gboolean +cph_cups_job_restart (CphCups *cups, + int job_id, + const char *user_name) +{ + g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE); + + if (!_cph_cups_is_job_id_valid (cups, job_id)) + return FALSE; + /* we don't check if the user name is valid or not because it comes + * from getpwuid(), and not dbus */ + + return _cph_cups_send_new_simple_job_request (cups, IPP_RESTART_JOB, + job_id, + user_name, + CPH_RESOURCE_JOBS); +} + +gboolean +cph_cups_job_set_hold_until (CphCups *cups, + int job_id, + const char *job_hold_until, + const char *user_name) +{ + g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE); + + if (!_cph_cups_is_job_id_valid (cups, job_id)) + return FALSE; + if (!_cph_cups_is_job_hold_until_valid (cups, job_hold_until)) + return FALSE; + /* we don't check if the user name is valid or not because it comes + * from getpwuid(), and not dbus */ + + return _cph_cups_send_new_job_attributes_request (cups, + job_id, + "job-hold-until", + job_hold_until, + user_name, + CPH_RESOURCE_JOBS); +} + +CphJobStatus +cph_cups_job_get_status (CphCups *cups, + int job_id, + const char *user) +{ + CphJobStatus status = CPH_JOB_STATUS_INVALID; + cups_job_t *jobs; + int num_jobs; + int i; + + g_return_val_if_fail (CPH_IS_CUPS (cups), CPH_JOB_STATUS_INVALID); + + num_jobs = cupsGetJobs2 (cups->priv->connection, &jobs, NULL, 0, 0); + + for (i = 0; i < num_jobs; i++) { + if (jobs[i].id == job_id) { + if (user != NULL && + g_strcmp0 (jobs[i].user, user) == 0) + status = CPH_JOB_STATUS_OWNED_BY_USER; + else + status = CPH_JOB_STATUS_NOT_OWNED_BY_USER; + break; + } + } + + cupsFreeJobs (num_jobs, jobs); + + return status; +} + /****************************************************** * Non-object functions ******************************************************/ @@ -1606,6 +1832,7 @@ g_str_has_prefix (lower_uri, "beh:") || g_str_has_prefix (lower_uri, "scsi:") || g_str_has_prefix (lower_uri, "serial:") || + g_str_has_prefix (lower_uri, "file:") || g_str_has_prefix (lower_uri, "pipe:")) { g_free (lower_uri); return TRUE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/cups.h new/cups-pk-helper-0.0.4/src/cups.h --- old/cups-pk-helper-0.0.3/src/cups.h 2008-11-21 01:50:42.000000000 +0100 +++ new/cups-pk-helper-0.0.4/src/cups.h 2009-02-28 03:38:13.000000000 +0100 @@ -48,6 +48,13 @@ GObjectClass parent_class; } CphCupsClass; +typedef enum +{ + CPH_JOB_STATUS_INVALID, + CPH_JOB_STATUS_OWNED_BY_USER, + CPH_JOB_STATUS_NOT_OWNED_BY_USER +} CphJobStatus; + GType cph_cups_get_type (void); CphCups *cph_cups_new (void); @@ -160,6 +167,23 @@ gboolean cph_cups_is_printer_uri_local (const char *uri); +gboolean cph_cups_job_cancel (CphCups *cups, + int job_id, + const char *user_name); + +gboolean cph_cups_job_restart (CphCups *cups, + int job_id, + const char *user_name); + +gboolean cph_cups_job_set_hold_until (CphCups *cups, + int job_id, + const char *job_hold_until, + const char *user_name); + +CphJobStatus cph_cups_job_get_status (CphCups *cups, + int job_id, + const char *user); + G_END_DECLS #endif /* CPH_CUPS_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/cups-pk-helper-mechanism.c new/cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c --- old/cups-pk-helper-0.0.3/src/cups-pk-helper-mechanism.c 2008-11-21 07:28:20.000000000 +0100 +++ new/cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c 2009-02-28 03:38:13.000000000 +0100 @@ -47,6 +47,8 @@ #include <polkit-dbus/polkit-dbus.h> +#include <pwd.h> + #include "cups-pk-helper-mechanism.h" #include "cups-pk-helper-mechanism-glue.h" #include "cups.h" @@ -56,7 +58,8 @@ static gboolean do_exit (gpointer user_data) { - g_object_unref (CPH_MECHANISM (user_data)); + if (user_data != NULL) + g_object_unref (CPH_MECHANISM (user_data)); exit (0); @@ -465,6 +468,30 @@ return "printer-remote-edit"; } +char * +_cph_mechanism_get_callers_user_name (CphMechanism *mechanism, + DBusGMethodInvocation *context) +{ + unsigned long sender_uid; + struct passwd *password_entry; + DBusError dbus_error; + gchar *sender; + char *user_name = NULL; + + sender = dbus_g_method_get_sender (context); + dbus_error_init (&dbus_error); + sender_uid = dbus_bus_get_unix_user ( + dbus_g_connection_get_connection (mechanism->priv->system_bus_connection), + sender, &dbus_error); + password_entry = getpwuid ((uid_t) sender_uid); + + if (password_entry != NULL) + user_name = g_strdup (password_entry->pw_name); + + g_free (sender); + + return user_name; +} /* helpers */ @@ -536,10 +563,6 @@ ret = cph_cups_file_put (mechanism->priv->cups, resource, filename); _cph_mechanism_return_error (mechanism, context, !ret); - /* TODO: this is a workaround for bnc#447422 - * https://bugzilla.novell.com/show_bug.cgi?id=447422 */ - do_exit (NULL); - return TRUE; } @@ -1016,3 +1039,130 @@ return TRUE; } + +gboolean +cph_mechanism_job_cancel (CphMechanism *mechanism, + int id, + DBusGMethodInvocation *context) +{ + CphJobStatus job_status; + gboolean ret; + char *user_name; + + reset_killtimer (mechanism); + + user_name = _cph_mechanism_get_callers_user_name (mechanism, context); + job_status = cph_cups_job_get_status (mechanism->priv->cups, + id, user_name); + + switch (job_status) { + case CPH_JOB_STATUS_OWNED_BY_USER: { + if (!_check_polkit_for_action_v (mechanism, context, + "job-not-owned-edit", + "job-edit", + NULL)) + return FALSE; + break; + } + case CPH_JOB_STATUS_NOT_OWNED_BY_USER: { + if (!_check_polkit_for_action (mechanism, context, + "job-not-owned-edit")) + return FALSE; + break; + } + case CPH_JOB_STATUS_INVALID: + return FALSE; + } + + ret = cph_cups_job_cancel (mechanism->priv->cups, id, user_name); + _cph_mechanism_return_error (mechanism, context, !ret); + + g_free (user_name); + + return TRUE; +} + +gboolean +cph_mechanism_job_restart (CphMechanism *mechanism, + int id, + DBusGMethodInvocation *context) +{ + CphJobStatus job_status; + gboolean ret; + char *user_name; + + reset_killtimer (mechanism); + + user_name = _cph_mechanism_get_callers_user_name (mechanism, context); + job_status = cph_cups_job_get_status (mechanism->priv->cups, + id, user_name); + + switch (job_status) { + case CPH_JOB_STATUS_OWNED_BY_USER: { + if (!_check_polkit_for_action_v (mechanism, context, + "job-not-owned-edit", + "job-edit", + NULL)) + return FALSE; + break; + } + case CPH_JOB_STATUS_NOT_OWNED_BY_USER: { + if (!_check_polkit_for_action (mechanism, context, + "job-not-owned-edit")) + return FALSE; + break; + } + case CPH_JOB_STATUS_INVALID: + return FALSE; + } + + ret = cph_cups_job_restart (mechanism->priv->cups, id, user_name); + _cph_mechanism_return_error (mechanism, context, !ret); + + g_free (user_name); + + return TRUE; +} + +gboolean +cph_mechanism_job_set_hold_until (CphMechanism *mechanism, + int id, + const char *job_hold_until, + DBusGMethodInvocation *context) +{ + CphJobStatus job_status; + gboolean ret; + char *user_name; + + reset_killtimer (mechanism); + + user_name = _cph_mechanism_get_callers_user_name (mechanism, context); + job_status = cph_cups_job_get_status (mechanism->priv->cups, + id, user_name); + + switch (job_status) { + case CPH_JOB_STATUS_OWNED_BY_USER: { + if (!_check_polkit_for_action_v (mechanism, context, + "job-not-owned-edit", + "job-edit", + NULL)) + return FALSE; + break; + } + case CPH_JOB_STATUS_NOT_OWNED_BY_USER: { + if (!_check_polkit_for_action (mechanism, context, + "job-not-owned-edit")) + return FALSE; + break; + } + case CPH_JOB_STATUS_INVALID: + return FALSE; + } + + ret = cph_cups_job_set_hold_until (mechanism->priv->cups, id, job_hold_until, user_name); + _cph_mechanism_return_error (mechanism, context, !ret); + + g_free (user_name); + + return TRUE; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/cups-pk-helper-mechanism.h new/cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h --- old/cups-pk-helper-0.0.3/src/cups-pk-helper-mechanism.h 2008-11-21 01:57:03.000000000 +0100 +++ new/cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h 2009-02-28 03:38:13.000000000 +0100 @@ -220,6 +220,22 @@ GHashTable *settings, DBusGMethodInvocation *context); +gboolean +cph_mechanism_job_cancel (CphMechanism *mechanism, + int id, + DBusGMethodInvocation *context); + +gboolean +cph_mechanism_job_restart (CphMechanism *mechanism, + int id, + DBusGMethodInvocation *context); + +gboolean +cph_mechanism_job_set_hold_until (CphMechanism *mechanism, + int id, + const char *job_hold_until, + DBusGMethodInvocation *context); + G_END_DECLS #endif /* CPH_MECHANISM_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/cups-pk-helper-mechanism.xml new/cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml --- old/cups-pk-helper-0.0.3/src/cups-pk-helper-mechanism.xml 2008-11-21 01:55:52.000000000 +0100 +++ new/cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml 2009-02-28 03:38:13.000000000 +0100 @@ -174,5 +174,23 @@ <arg name="error" direction="out" type="s"/> </method> + <method name="JobCancel"> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="jobid" direction="in" type="i"/> + <arg name="error" direction="out" type="s"/> + </method> + + <method name="JobRestart"> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="jobid" direction="in" type="i"/> + <arg name="error" direction="out" type="s"/> + </method> + + <method name="JobSetHoldUntil"> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="jobid" direction="in" type="i"/> + <arg name="job_hold_until" direction="in" type="s"/> + <arg name="error" direction="out" type="s"/> + </method> </interface> </node> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/org.opensuse.CupsPkHelper.Mechanism.conf new/cups-pk-helper-0.0.4/src/org.opensuse.CupsPkHelper.Mechanism.conf --- old/cups-pk-helper-0.0.3/src/org.opensuse.CupsPkHelper.Mechanism.conf 2008-09-19 12:48:34.000000000 +0200 +++ new/cups-pk-helper-0.0.4/src/org.opensuse.CupsPkHelper.Mechanism.conf 2009-01-27 00:41:44.000000000 +0100 @@ -8,12 +8,11 @@  <policy user="root"> <allow own="org.opensuse.CupsPkHelper.Mechanism"/> - <allow send_interface="org.opensuse.CupsPkHelper.Mechanism"/> </policy>  <policy context="default"> - <allow send_interface="org.opensuse.CupsPkHelper.Mechanism"/> + <allow send_destination="org.opensuse.CupsPkHelper.Mechanism"/> </policy> </busconfig> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-pk-helper-0.0.3/src/org.opensuse.cupspkhelper.mechanism.policy.in new/cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in --- old/cups-pk-helper-0.0.3/src/org.opensuse.cupspkhelper.mechanism.policy.in 2008-11-21 00:58:16.000000000 +0100 +++ new/cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in 2009-02-28 03:38:13.000000000 +0100 @@ -68,6 +68,24 @@ </defaults> </action> + <action id="org.opensuse.cupspkhelper.mechanism.job-edit"> + <_description>Restart/Cancel/Edit a job</_description> + <_message>Privileges are required to restart/cancel/edit a job.</_message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + + <action id="org.opensuse.cupspkhelper.mechanism.job-not-owned-edit"> + <_description>Restart/Cancel/Edit a job owned by another user</_description> + <_message>Privileges are required to restart/cancel/edit a job owned by another user.</_message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + </action> +  <action id="org.opensuse.cupspkhelper.mechanism.printeraddremove"> <_description>Add/Remove/Edit a printer</_description> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit banshee-1 for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package banshee-1 for openSUSE:Factory checked in at Fri Mar 6 00:22:58 CET 2009. -------- --- GNOME/banshee-1/banshee-1.changes 2009-02-04 19:14:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/banshee-1/banshee-1.changes 2009-03-05 03:07:57.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 4 19:39:22 EST 2009 - abockover(a)novell.com + +- Update to 1.4.3 release + * Bug-fix-only release + * 17 bugs fixed since 1.4.2 (most of which were already applied) + * Removed the Novell translations since I disagree with the way + we handle them with upstream - the upstream translations are + rather complete (~93%); kept the Korean translation since one + does not exist upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- banshee-1-1.4.2.tar.bz2 bnc376532-fix-radio-hang-lack-of-feedback.patch bnc465214-freeze-on-dap-load.patch bnc467377-crash-on-delete-from-fsq.patch bnc470722-fix-mtp-device-crash.patch bnc472522-sr-latn-translation-breaks-build.patch bnc472524-adding-files-to-mtp-device-fails.patch bnc472526-dap-playlists-not-saved.patch New: ---- banshee-1-1.4.3.tar.bz2 ko.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee-1.spec ++++++ --- /var/tmp/diff_new_pack.K24993/_old 2009-03-06 00:22:12.000000000 +0100 +++ /var/tmp/diff_new_pack.K24993/_new 2009-03-06 00:22:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package banshee-1 (Version 1.4.2) +# spec file for package banshee-1 (Version 1.4.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: banshee-1 -Version: 1.4.2 -Release: 2 +Version: 1.4.3 +Release: 1 License: X11/MIT Summary: A music playback and management application Group: Productivity/Multimedia/Sound/Players @@ -28,14 +28,8 @@ Source0: %{name}-%{version}.tar.bz2 Source1: bundleize-pkg-config.awk Source2: banshee-po.tar.bz2 -Patch0: desktop-file-trailing-semicolon.patch -Patch1: bnc465214-freeze-on-dap-load.patch -Patch2: bnc467377-crash-on-delete-from-fsq.patch -Patch3: bnc470722-fix-mtp-device-crash.patch -Patch4: bnc376532-fix-radio-hang-lack-of-feedback.patch -Patch5: bnc472526-dap-playlists-not-saved.patch -Patch6: bnc472524-adding-files-to-mtp-device-fails.patch -Patch7: bnc472522-sr-latn-translation-breaks-build.patch +Patch0: ko.patch +Patch1: desktop-file-trailing-semicolon.patch AutoReqProv: on PreReq: filesystem gconf2 ExcludeArch: s390 s390x @@ -205,14 +199,8 @@ %lang_package %prep %setup -q -a2 -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 +%patch0 -p1 +%patch1 -p0 # update pkg-config files for the -devel package since we internalize # some BuildRequires in cases where we will upgrade a package that # might also be provided by the distro (e.g. taglib-sharp) @@ -371,6 +359,14 @@ %{_datadir}/banshee-1/icons/hicolor/*/devices/phone-* %changelog +* Wed Mar 04 2009 abockover(a)novell.com +- Update to 1.4.3 release + * Bug-fix-only release + * 17 bugs fixed since 1.4.2 (most of which were already applied) + * Removed the Novell translations since I disagree with the way + we handle them with upstream - the upstream translations are + rather complete (~93%%); kept the Korean translation since one + does not exist upstream * Wed Feb 04 2009 gburt(a)suse.de - Patch fixing playlists not being saved to DAPs (bnc#472526) - Patch fixing adding files to MTP devices (bnc#472524) @@ -406,7 +402,7 @@ * Sat Jan 10 2009 abockover(a)novell.com - Fix up desktop files (bnc#456120, bnc#459993, bnc#440615, bnc#461677) - Fix primary desktop file to -N "Banshee" -G "Media Player" (bnc#433594) -* Fri Jan 09 2009 abockover(a)novell.com +* Sat Jan 10 2009 abockover(a)novell.com - Patch to set the mimetype for ripped tracks (bnc#464889) - Patch to handle spaces in command line arguments (bnc#440883) - Patch to make xx_YY langs work from xml:lang, fixes zh_CN et al (bnc#449788) ++++++ banshee-1-1.4.2.tar.bz2 -> banshee-1-1.4.3.tar.bz2 ++++++ ++++ 12336 lines of diff (skipped) ++++++ banshee-po.tar.bz2 ++++++ ++++ 65601 lines of diff (skipped) ++++++ ko.patch ++++++ diff --git a/po/LINGUAS b/po/LINGUAS index 693d9cb..ce72833 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -17,7 +17,8 @@ gu he hu it -ja +ja +ko lt lv mk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xhtml-dtd for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package xhtml-dtd for openSUSE:Factory checked in at Thu Mar 5 17:22:11 CET 2009. -------- --- xhtml-dtd/xhtml-dtd.changes 2007-01-11 15:07:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/xhtml-dtd/xhtml-dtd.changes 2009-03-05 16:24:23.038691000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 5 16:24:11 CET 2009 - ro(a)suse.de + +- try to fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xhtml-dtd.spec ++++++ --- /var/tmp/diff_new_pack.sm8261/_old 2009-03-05 17:21:44.000000000 +0100 +++ /var/tmp/diff_new_pack.sm8261/_new 2009-03-05 17:21:44.000000000 +0100 @@ -1,28 +1,36 @@ # -# spec file for package xhtml-dtd (Version 2002.8.9) +# spec file for package xhtml-dtd (Version 2008.7.23) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: xhtml-dtd BuildRequires: sgml-skel Summary: XHTML DTDs (Document Type Definitions) -Version: 2002.8.9 -Release: 103 +Version: 2008.7.23 +Release: 1 Group: Productivity/Publishing/HTML/Tools -BuildArchitectures: noarch +BuildArch: noarch Requires: sgml-skel libxml2 %define regcat /usr/bin/sgml-register-catalog PreReq: %{regcat} /usr/bin/xmlcatalog PreReq: /usr/bin/edit-xml-catalog License: Public Domain, Freeware -URL: http://www.w3.org/MarkUp/ +Url: http://www.w3.org/MarkUp/ Source0: http://www.w3.org/Consortium/Legal/copyright-software.html Source1: http://www.w3.org/TR/xhtml1/xhtml1.tgz Source2: http://www.w3.org/TR/2001/REC-xhtml11-20010531/xhtml11.tgz @@ -64,6 +72,7 @@ %define INSTALL_SCRIPT install -m755 %define INSTALL_DIR install -d -m755 %define INSTALL_DATA install -m644 + %prep %setup -q -c -T # %patch @@ -168,7 +177,7 @@ set -- $(echo "$line") IFS=$OLDIFS # echo $3 $2 $1 - install-dtd.sh -p xhtml/schema/dtd/1.0 -s $RPM_BUILD_ROOT%{sgml_dir} \ + install-dtd.sh -p xhtml/schema/dtd/1.0 -s $RPM_BUILD_ROOT%{xml_dir} \ -f "$3" -i "$2" || exit 1 done # done < <(../../parse_cat xhtml1/DTD/xhtml.soc) @@ -176,21 +185,24 @@ OLDIFS=$IFS; IFS='|' set -- $(echo "$line") IFS=$OLDIFS - install-dtd.sh -p xhtml/schema/dtd/1.0-basic -s $RPM_BUILD_ROOT%{sgml_dir} \ + install-dtd.sh -p xhtml/schema/dtd/1.0-basic -s $RPM_BUILD_ROOT%{xml_dir} \ -f "$3" -i "$2" || exit 1 done parse_cat xhtml-modularization/DTD/xhtml.cat | while read line; do OLDIFS=$IFS; IFS='|' set -- $(echo "$line") IFS=$OLDIFS - install-dtd.sh -p xhtml/schema/dtd/1.0-modularization -s $RPM_BUILD_ROOT%{sgml_dir} \ + case $3 in + xhtml-redecl-1.mod|xhtml-ruby-1.mod|xhtml11-arch.dtd|xhtml-legacy-redecl-1.mod) continue ;; + esac + install-dtd.sh -p xhtml/schema/dtd/1.0-modularization -s $RPM_BUILD_ROOT%{xml_dir} \ -f "$3" -i "$2" || exit 1 done parse_cat xhtml11-20010531/DTD/xhtml11.cat | while read line; do OLDIFS=$IFS; IFS='|' set -- $(echo "$line") IFS=$OLDIFS - install-dtd.sh -p xhtml/schema/dtd/1.1 -s $RPM_BUILD_ROOT%{sgml_dir} \ + install-dtd.sh -p xhtml/schema/dtd/1.1 -s $RPM_BUILD_ROOT%{xml_dir} \ -f "$3" -i "$2" || exit 1 done { @@ -277,57 +289,59 @@ %dir %{xml_mod_dir} %dir %{xml_mod_schema_dir} %{xml_mod_dtd_dir} -# %{sgml_dir}/W3C/*/* +%{xml_dir}/W3C # spec file ends here -%changelog -n xhtml-dtd -* Thu Jan 11 2007 - ke(a)suse.de +%changelog +* Thu Mar 05 2009 ro(a)suse.de +- try to fix build +* Thu Jan 11 2007 ke(a)suse.de - Remove /usr/share/xml from the files list. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Sep 29 2005 - dmueller(a)suse.de +* Wed Sep 28 2005 dmueller(a)suse.de - add norootforbuild -* Wed Mar 09 2005 - ke(a)suse.de +* Wed Mar 09 2005 ke(a)suse.de - Add edit-xml-catalog as "PreReq:"; reported by Thomas Schmidt [# 71811]. -* Wed Feb 11 2004 - ke(a)suse.de +* Wed Feb 11 2004 ke(a)suse.de - Finally, move DTDs to /usr/share/xml/xhtml/schema/dtd. -* Thu Jan 29 2004 - ke(a)suse.de +* Thu Jan 29 2004 ke(a)suse.de - Adjust directories according to FHS 2.3: * Move XML DTDs to /usr/share/xml/xhtml. * Keep CATALOG.* files in /usr/share/sgml for the time being. * Improve XML catalog (/etc/xml/xhtml/xml). -* Mon Jun 16 2003 - ke(a)suse.de +* Mon Jun 16 2003 ke(a)suse.de - Update XHTMLplusMathMLplusSVG to 20020809. -* Mon Jun 16 2003 - ke(a)suse.de +* Mon Jun 16 2003 ke(a)suse.de - Add missing directory. -* Tue Jun 10 2003 - coolo(a)suse.de +* Tue Jun 10 2003 coolo(a)suse.de - fix syntax errors - removed exit 0 -* Mon Jun 02 2003 - ke(a)suse.de +* Mon Jun 02 2003 ke(a)suse.de - Create proper links in docdir; reported by Stephan Kulow. - Use edit-xml-catalog in %%post/%%postun for managing /etc/xml/catalog. -* Mon Feb 24 2003 - ke(a)suse.de +* Mon Feb 24 2003 ke(a)suse.de - In %%post drop brain dead file check which cause re-creation of an empty xml catalog file; reported by Thomas Schraitle [# 24186]. -* Tue Dec 10 2002 - ke(a)suse.de +* Tue Dec 10 2002 ke(a)suse.de - Register SGML catalogs using sgml-register-catalog; related to bug [# 12050]. - Move docs to the documentation area. -* Mon Jun 24 2002 - ro(a)suse.de +* Sun Jun 23 2002 ro(a)suse.de - fixed directory permissions -* Mon May 06 2002 - ke(a)suse.de +* Mon May 06 2002 ke(a)suse.de - Add libxml2 to 'neededforbuild'. - Add XHTMLplusMathMLplusSVG.tgz (we'll install it later). - Provide more catalogs for modularized DTDs. -* Mon Aug 27 2001 - ke(a)suse.de +* Mon Aug 27 2001 ke(a)suse.de - Update xhtml-modularization and xhtml11. - Cleanup spec file. - Add sgml-skel to 'neededforbuild'. -* Mon Mar 19 2001 - ke(a)suse.de +* Mon Mar 19 2001 ke(a)suse.de - Add install-dtd.sh. - Provide convenience links for DTDs and Entities using install-dtd.sh. - Move all the data from /usr/share/sgml/xhtml-1.0 into /usr/share/sgml/xhtml/xhtml-1.0. -* Wed Mar 14 2001 - ke(a)suse.de +* Wed Mar 14 2001 ke(a)suse.de - New package (partly take over from html_dtd). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tvbrowser for openSUSE:Factory
by root＠Hilbert.suse.de 05 Mar '09

05 Mar '09

Hello community, here is the log from the commit of package tvbrowser for openSUSE:Factory checked in at Thu Mar 5 17:05:04 CET 2009. -------- --- tvbrowser/tvbrowser.changes 2009-02-07 20:52:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/tvbrowser/tvbrowser.changes 2009-03-05 16:14:13.274263000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 5 16:14:04 CET 2009 - ro(a)suse.de + +- added optipng to buildreq + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tvbrowser.spec ++++++ --- /var/tmp/diff_new_pack.y20622/_old 2009-03-05 17:04:55.000000000 +0100 +++ /var/tmp/diff_new_pack.y20622/_new 2009-03-05 17:04:55.000000000 +0100 @@ -18,9 +18,10 @@ Name: tvbrowser +BuildRequires: optipng Summary: digital TV guide Version: 2.7.2 -Release: 2 +Release: 5 License: LGPL v2.1 or later Group: Productivity/Networking/News/Utilities Requires: java >= 1.6 @@ -55,7 +56,7 @@ rm -f *.url find -name "*.png" | while read a do - optipng -o 5 "$a" + optipng -o 5 "$a" || optipng -o 5 -fix "$a" done install -d %buildroot%_datadir/%name install -d %buildroot/usr/bin @@ -85,6 +86,8 @@ ln -s -f %_datadir/%name/tvbrowser.sh /usr/bin/tvbrowser %changelog +* Thu Mar 05 2009 ro(a)suse.de +- added optipng to buildreq * Sat Feb 07 2009 coolo(a)suse.de - own the hicolor directories too * Thu Jan 22 2009 tpatzig(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0