January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-trans for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at Tue Jan 25 10:12:24 CET 2011. -------- --- yast2-trans/yast2-trans.changes 2011-01-10 12:49:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-trans/yast2-trans.changes 2011-01-24 16:49:06.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 24 15:29:47 CET 2011 - ke(a)suse.de + +- Updated languages: af am ar be bg bn bs ca cs cy da de el es et fa + fi fr gl gu he hi hr hu id it ja jv ka km kn ko ku lo lt mk mr ms my nb + nl pa pl pt ro ru si sk sl sr sv sw ta tg th tk tr uk vi wa xh zu en_GB + en_US pt_BR zh_CN zh_TW ast nds. + +------------------------------------------------------------------------ calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans.spec ++++++ --- /var/tmp/diff_new_pack.M7NfMd/_old 2011-01-25 10:11:55.000000000 +0100 +++ /var/tmp/diff_new_pack.M7NfMd/_new 2011-01-25 10:11:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans (Version 2.19.0) +# spec file for package yast2-trans # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: yast2-trans Version: 2.19.0 -Release: 22 +Release: 23 License: GPLv2+ Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-trans-af-2.19.0.tar.bz2 ++++++ ++++ 1757 lines of diff (skipped) ++++++ yast2-trans-am-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-ar-2.19.0.tar.bz2 ++++++ ++++ 1725 lines of diff (skipped) ++++++ yast2-trans-ast-2.19.0.tar.bz2 ++++++ ++++ 1708 lines of diff (skipped) ++++++ yast2-trans-be-2.19.0.tar.bz2 ++++++ ++++ 1719 lines of diff (skipped) ++++++ yast2-trans-bg-2.19.0.tar.bz2 ++++++ ++++ 1805 lines of diff (skipped) ++++++ yast2-trans-bn-2.19.0.tar.bz2 ++++++ ++++ 1758 lines of diff (skipped) ++++++ yast2-trans-bs-2.19.0.tar.bz2 ++++++ ++++ 1757 lines of diff (skipped) ++++++ yast2-trans-ca-2.19.0.tar.bz2 ++++++ ++++ 1743 lines of diff (skipped) ++++++ yast2-trans-cs-2.19.0.tar.bz2 ++++++ ++++ 1716 lines of diff (skipped) ++++++ yast2-trans-cy-2.19.0.tar.bz2 ++++++ ++++ 1745 lines of diff (skipped) ++++++ yast2-trans-da-2.19.0.tar.bz2 ++++++ ++++ 3323 lines of diff (skipped) ++++++ yast2-trans-de-2.19.0.tar.bz2 ++++++ ++++ 3069 lines of diff (skipped) ++++++ yast2-trans-el-2.19.0.tar.bz2 ++++++ ++++ 1762 lines of diff (skipped) ++++++ yast2-trans-en_GB-2.19.0.tar.bz2 ++++++ ++++ 1757 lines of diff (skipped) ++++++ yast2-trans-en_US-2.19.0.tar.bz2 ++++++ ++++ 1719 lines of diff (skipped) ++++++ yast2-trans-es-2.19.0.tar.bz2 ++++++ ++++ 1876 lines of diff (skipped) ++++++ yast2-trans-et-2.19.0.tar.bz2 ++++++ ++++ 1781 lines of diff (skipped) ++++++ yast2-trans-fa-2.19.0.tar.bz2 ++++++ ++++ 1702 lines of diff (skipped) ++++++ yast2-trans-fi-2.19.0.tar.bz2 ++++++ ++++ 1746 lines of diff (skipped) ++++++ yast2-trans-fr-2.19.0.tar.bz2 ++++++ ++++ 2918 lines of diff (skipped) ++++++ yast2-trans-gl-2.19.0.tar.bz2 ++++++ ++++ 2009 lines of diff (skipped) ++++++ yast2-trans-gu-2.19.0.tar.bz2 ++++++ ++++ 1757 lines of diff (skipped) ++++++ yast2-trans-he-2.19.0.tar.bz2 ++++++ ++++ 1767 lines of diff (skipped) ++++++ yast2-trans-hi-2.19.0.tar.bz2 ++++++ ++++ 1761 lines of diff (skipped) ++++++ yast2-trans-hr-2.19.0.tar.bz2 ++++++ ++++ 1795 lines of diff (skipped) ++++++ yast2-trans-hu-2.19.0.tar.bz2 ++++++ ++++ 1764 lines of diff (skipped) ++++++ yast2-trans-id-2.19.0.tar.bz2 ++++++ ++++ 1749 lines of diff (skipped) ++++++ yast2-trans-it-2.19.0.tar.bz2 ++++++ ++++ 2745 lines of diff (skipped) ++++++ yast2-trans-ja-2.19.0.tar.bz2 ++++++ ++++ 1711 lines of diff (skipped) ++++++ yast2-trans-jv-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-ka-2.19.0.tar.bz2 ++++++ ++++ 1687 lines of diff (skipped) ++++++ yast2-trans-km-2.19.0.tar.bz2 ++++++ ++++ 1711 lines of diff (skipped) ++++++ yast2-trans-kn-2.19.0.tar.bz2 ++++++ ++++ 1696 lines of diff (skipped) ++++++ yast2-trans-ko-2.19.0.tar.bz2 ++++++ ++++ 1822 lines of diff (skipped) ++++++ yast2-trans-ku-2.19.0.tar.bz2 ++++++ ++++ 1690 lines of diff (skipped) ++++++ yast2-trans-lo-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-lt-2.19.0.tar.bz2 ++++++ ++++ 2049 lines of diff (skipped) ++++++ yast2-trans-mk-2.19.0.tar.bz2 ++++++ ++++ 1733 lines of diff (skipped) ++++++ yast2-trans-mr-2.19.0.tar.bz2 ++++++ ++++ 1755 lines of diff (skipped) ++++++ yast2-trans-ms-2.19.0.tar.bz2 ++++++ ++++ 1686 lines of diff (skipped) ++++++ yast2-trans-my-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-nb-2.19.0.tar.bz2 ++++++ ++++ 1752 lines of diff (skipped) ++++++ yast2-trans-nds-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-nl-2.19.0.tar.bz2 ++++++ ++++ 1740 lines of diff (skipped) ++++++ yast2-trans-pa-2.19.0.tar.bz2 ++++++ ++++ 1887 lines of diff (skipped) ++++++ yast2-trans-pl-2.19.0.tar.bz2 ++++++ ++++ 1715 lines of diff (skipped) ++++++ yast2-trans-pt-2.19.0.tar.bz2 ++++++ ++++ 1727 lines of diff (skipped) ++++++ yast2-trans-pt_BR-2.19.0.tar.bz2 ++++++ ++++ 1716 lines of diff (skipped) ++++++ yast2-trans-ro-2.19.0.tar.bz2 ++++++ ++++ 1715 lines of diff (skipped) ++++++ yast2-trans-ru-2.19.0.tar.bz2 ++++++ ++++ 3386 lines of diff (skipped) ++++++ yast2-trans-si-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-sk-2.19.0.tar.bz2 ++++++ ++++ 1808 lines of diff (skipped) ++++++ yast2-trans-sl-2.19.0.tar.bz2 ++++++ ++++ 1813 lines of diff (skipped) ++++++ yast2-trans-sr-2.19.0.tar.bz2 ++++++ ++++ 1759 lines of diff (skipped) ++++++ yast2-trans-sv-2.19.0.tar.bz2 ++++++ ++++ 1755 lines of diff (skipped) ++++++ yast2-trans-sw-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-ta-2.19.0.tar.bz2 ++++++ ++++ 1750 lines of diff (skipped) ++++++ yast2-trans-tg-2.19.0.tar.bz2 ++++++ ++++ 1732 lines of diff (skipped) ++++++ yast2-trans-th-2.19.0.tar.bz2 ++++++ ++++ 1730 lines of diff (skipped) ++++++ yast2-trans-tk-2.19.0.tar.bz2 ++++++ ++++ 1684 lines of diff (skipped) ++++++ yast2-trans-tr-2.19.0.tar.bz2 ++++++ ++++ 1873 lines of diff (skipped) ++++++ yast2-trans-uk-2.19.0.tar.bz2 ++++++ ++++ 1745 lines of diff (skipped) ++++++ yast2-trans-vi-2.19.0.tar.bz2 ++++++ ++++ 1791 lines of diff (skipped) ++++++ yast2-trans-wa-2.19.0.tar.bz2 ++++++ ++++ 1883 lines of diff (skipped) ++++++ yast2-trans-xh-2.19.0.tar.bz2 ++++++ ++++ 1757 lines of diff (skipped) ++++++ yast2-trans-zh_CN-2.19.0.tar.bz2 ++++++ ++++ 1754 lines of diff (skipped) ++++++ yast2-trans-zh_TW-2.19.0.tar.bz2 ++++++ ++++ 1746 lines of diff (skipped) ++++++ yast2-trans-zu-2.19.0.tar.bz2 ++++++ ++++ 1757 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nautilus-terminal for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package nautilus-terminal for openSUSE:Factory checked in at Tue Jan 25 10:12:16 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus-terminal/nautilus-terminal.changes 2010-12-08 14:06:30.000000000 +0100 @@ -0,0 +1,29 @@ +------------------------------------------------------------------- +Thu Oct 28 17:53:01 UTC 2010 - prusnak(a)opensuse.org + +- Updated to version 0.7: + + Fixes the "Terminal on desktop" bug + + The terminal is now resizable with mouse (instead of buttons) + + Updated translations. +- Changes from version 0.6: + + Add optional scrollbar + + Nautilus Terminal is now enabled for non-local folders (but + with the path set on the home folder). + + The install script now check the dependencies + + The "terminal on desktop" bug is fixed (lp#642222) + + Updated translations. +- Changes from version 0.5: + + Fixes the refresh issue when the terminal is resized + + Nautilus Terminal is again available in /media. + + Nautilus Terminal Now support the drag & drop of file. + + Updated translations. +- Changes from version 0.4: + + Fixes a lot of bug and add some improvement (restart the shell + after an "exit" command, Ctrl+Shift+T now toggle Show/Hide). + + Updated translations. + +------------------------------------------------------------------- +Mon Sep 13 14:32:59 CEST 2010 - sbrabec(a)suse.cz + +- New package, version 0.3. + calling whatdependson for head-i586 New: ---- nautilus-terminal.changes nautilus-terminal.spec nautilus-terminal_0.7_src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-terminal.spec ++++++ # # spec file for package nautilus-terminal # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: nautilus-terminal Version: 0.7 Release: 1 License: GPLv3+ Summary: Integrated Terminal for the Nautilus File Browser Url: http://software.flogisoft.com/nautilus-terminal/ Group: System/GUI/GNOME Source: http://download.flogisoft.com/files/Software/nautilus-terminal/%{name}_%{ve… # For directory ownership: BuildRequires: python-nautilus Requires: nautilus Requires: python-nautilus Requires: python-vte Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Nautilus Terminal is an integrated terminal for the Nautilus file browser. %lang_package %prep %setup -q # AUTHORS is o+x... chmod -x AUTHORS sed -i ' s:/usr/share/doc:%{_docdir}/%{name}: s:/usr/share:%{_datadir}: s:/usr/lib:%{_libdir}: ' install.sh %build %install ./install.sh --package %{buildroot} %find_lang %{name} %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc %{_docdir}/%{name}/ %{_libdir}/nautilus/extensions-2.0/python/nautilus-terminal.py %{_datadir}/nautilus-terminal/ %files lang -f %{name}.lang %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner20 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package mozilla-xulrunner20 for openSUSE:Factory checked in at Tue Jan 25 10:11:35 CET 2011. -------- --- mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-01-12 22:47:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-01-22 23:02:53.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Jan 22 21:56:16 UTC 2011 - wr(a)rosenauer.org + +- update to 2.0b10 +- disabled mozilla-cpuid.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-2.0b9.tar.bz2 xulrunner-source-2.0b9.tar.bz2 New: ---- l10n-2.0b10.tar.bz2 xulrunner-source-2.0b10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner20.spec ++++++ --- /var/tmp/diff_new_pack.SvcdT4/_old 2011-01-25 10:10:59.000000000 +0100 +++ /var/tmp/diff_new_pack.SvcdT4/_new 2011-01-25 10:10:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner20 (Version 2.0b9) +# spec file for package mozilla-xulrunner20 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -30,10 +30,10 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 2.0b9 +Version: 2.0b10 Release: 1 -%define releasedate 2011011000 -%define version_internal 2.0b9 +%define releasedate 2011012100 +%define version_internal 2.0b10 %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 @@ -210,7 +210,7 @@ #%patch9 -p1 #%patch10 -p1 %if %suse_version < 1120 -%patch11 -p1 +#%patch11 -p1 %endif %patch12 -p1 %patch13 -p1 ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.SvcdT4/_old 2011-01-25 10:10:59.000000000 +0100 +++ /var/tmp/diff_new_pack.SvcdT4/_new 2011-01-25 10:10:59.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b9_RELEASE" -VERSION="2.0b9" +RELEASE_TAG="FIREFOX_4_0b10_RELEASE" +VERSION="2.0b10" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-2.0b9.tar.bz2 -> l10n-2.0b10.tar.bz2 ++++++ mozilla-xulrunner20/l10n-2.0b9.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/l10n-2.0b10.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-2.0b9.tar.bz2 -> xulrunner-source-2.0b10.tar.bz2 ++++++ mozilla-xulrunner20/xulrunner-source-2.0b9.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/xulrunner-source-2.0b10.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstfl for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libstfl for openSUSE:Factory checked in at Tue Jan 25 10:10:39 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libstfl/libstfl.changes 2010-06-25 01:03:38.000000000 +0200 @@ -0,0 +1,19 @@ +------------------------------------------------------------------- +Thu Jun 24 22:47:49 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 0.21 + +- changed spec file as libstfl now also ships a shared library + +------------------------------------------------------------------- +Thu Dec 10 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 0.20 + + +------------------------------------------------------------------- +Thu Aug 21 00:00:00 UTC 2008 - guru(a)unixtech.be + +- new package + + calling whatdependson for head-i586 New: ---- libstfl-rpmlintrc libstfl.changes libstfl.spec stfl-0.21.tar.gz stfl-ncurses.patch stfl-optflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstfl.spec ++++++ # # spec file for package libstfl # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define soname 0 Name: libstfl Version: 0.21 Release: 1 Summary: Structured Terminal Forms Library Source: http://www.clifford.at/stfl/stfl-%{version}.tar.gz Source99: libstfl-rpmlintrc Patch1: stfl-optflags.patch Patch2: stfl-ncurses.patch Url: http://www.clifford.at/stfl/ Group: System/Libraries License: GNU Lesser General Public License version 3 (LGPL v3) BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: swig perl python python-devel ruby ruby-devel BuildRequires: ncurses-devel pkgconfig BuildRequires: gcc glibc-devel make %description ............................................................................. %package -n libstfl%{soname} Summary: Structured Terminal Forms Library Group: System/Libraries %description -n libstfl%{soname} STFL is a library which implements a curses-based widget set for text terminals. The STFL API can be used from C, SPL, Python, Perl and Ruby. Since the API is only 14 simple function calls big and there are already generic SWIG bindings it is very easy to port STFL to additional scripting languages. A special language (the Structured Terminal Forms Language) is used to describe STFL GUIs. The language is designed to be easy and fast to write so an application programmer does not need to spend ages fiddling around with the GUI and can concentrate on the more interesting programming tasks. %package -n libstfl-devel License: GNU Lesser General Public License version 3 (LGPL v3) Summary: Structured Terminal Forms Library Group: Development/Libraries/C and C++ Requires: ncurses-devel Requires: libstfl%{soname} = %{version} %description -n libstfl-devel STFL is a library which implements a curses-based widget set for text terminals. The STFL API can be used from C, SPL, Python, Perl and Ruby. Since the API is only 14 simple function calls big and there are already generic SWIG bindings it is very easy to port STFL to additional scripting languages. A special language (the Structured Terminal Forms Language) is used to describe STFL GUIs. The language is designed to be easy and fast to write so an application programmer does not need to spend ages fiddling around with the GUI and can concentrate on the more interesting programming tasks. %prep %setup -q -n "stfl-%{version}" %patch1 %patch2 %build # -j breaks build %__make %{?jobs:-j%{jobs}} \ prefix="%{_prefix}" \ libdir="%{_lib}" \ CC="%__cc" \ OPTFLAGS="%{optflags}" \ FOUND_SPL=0 \ FOUND_SWIG=0 \ FOUND_RUBY=0 \ FOUND_PERL=0 \ FOUND_PYTHON=0 %install %makeinstall \ prefix="%{_prefix}" \ libdir="%{_lib}" \ FOUND_SPL=0 \ FOUND_SWIG=0 \ FOUND_RUBY=0 \ FOUND_PERL=0 \ FOUND_PYTHON=0 [ -e "%{buildroot}%{_libdir}/libstfl.so.%{soname}" ] || { pushd "%{buildroot}%{_libdir}/" %__ln_s libstfl.so.*.* libstfl.so.%{soname} popd } %post -n libstfl%{soname} -p /sbin/ldconfig %postun -n libstfl%{soname} -p /sbin/ldconfig %clean %{?buildroot:%__rm -rf "%{buildroot}"} %files -n libstfl%{soname} %defattr(-,root,root) %doc COPYING README %{_libdir}/libstfl.so.%{soname} %{_libdir}/libstfl.so.%{soname}.* %files -n libstfl-devel %defattr(-,root,root) %{_includedir}/stfl.h %{_libdir}/libstfl.so %{_libdir}/libstfl.a %{_libdir}/pkgconfig/stfl.pc %changelog ++++++ libstfl-rpmlintrc ++++++ addFilter("description-shorter-than-summary") addFilter("no-dependency-on libstfl/libstfl-libs/liblibstfl") ++++++ stfl-ncurses.patch ++++++ --- stfl_internals.h.orig 2008-05-06 11:44:36.000000000 +0200 +++ stfl_internals.h 2009-12-10 01:52:13.000000000 +0100 @@ -28,7 +28,7 @@ #endif #include "stfl.h" -#include <ncursesw/ncurses.h> +#include <ncurses.h> #include <pthread.h> struct stfl_widget_type; ++++++ stfl-optflags.patch ++++++ --- Makefile.orig 2010-06-25 00:59:31.000000000 +0200 +++ Makefile 2010-06-25 01:01:34.000000000 +0200 @@ -20,9 +20,10 @@ include Makefile.cfg -export CC = gcc -pthread -export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC -export LDLIBS += -lncursesw +export CC = gcc +OPTFLAGS=-Os -ggdb +export CFLAGS += -pthread -I. -Wall -D_GNU_SOURCE -fPIC $(OPTFLAGS) +export LDLIBS += -pthread -lncursesw SONAME := libstfl.so.0 VERSION := 0.21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libvirt for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at Tue Jan 25 10:10:32 CET 2011. -------- --- libvirt/libvirt.changes 2011-01-14 23:41:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2011-01-18 17:27:27.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 18 09:25:18 MST 2011 - jfehlig(a)novell.com + +- Enabled yajl for suse_version >= 1140 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.atd2bK/_old 2011-01-25 10:09:19.000000000 +0100 +++ /var/tmp/diff_new_pack.atd2bK/_new 2011-01-25 10:09:19.000000000 +0100 @@ -39,22 +39,22 @@ %define with_selinux 1 %define with_apparmor 0 # options -# still no yajl json library -%define with_yajl 0 -%if 0%{?suse_version} >= 1130 -%define with_capng 1 -%else -%define with_capng 0 -%endif %if 0%{?suse_version} >= 1140 +%define with_yajl 1 %define with_netcf 1 %define with_macvtap 1 %define with_virtualport 1 %else +%define with_yajl 0 %define with_netcf 0 %define with_macvtap 0 %define with_virtualport 0 %endif +%if 0%{?suse_version} >= 1130 +%define with_capng 1 +%else +%define with_capng 0 +%endif %if 0%{?suse_version} > 1110 %define with_udev 1 %define with_hal 0 @@ -145,7 +145,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: yes Version: 0.8.7 -Release: 1 +Release: 2 Summary: A C toolkit to interract with the virtualization capabilities of Linux # The client side, i.e. shared libs and virsh are in a subpackage Requires: %{name}-client = %{version}-%{release} @@ -158,6 +158,9 @@ Recommends: dnsmasq Recommends: open-iscsi Recommends: nfs-client +%if %{with_yajl} +Requires: libyajl +%endif %if %{with_hal} Requires: hal %endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libpanelappletmm for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libpanelappletmm for openSUSE:Factory checked in at Tue Jan 25 10:09:00 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpanelappletmm/libpanelappletmm.changes 2011-01-07 15:49:41.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 7 15:42:53 CET 2011 - vuntz(a)opensuse.org + +- Cleanup for inclusion in Factory. + +------------------------------------------------------------------- +Sun Apr 4 13:15:20 UTC 2010 - bitshuffler #suse(a)irc.freenode.org + +- Initial package (version 2.26.0). + calling whatdependson for head-i586 New: ---- libpanelappletmm-2.26.0.tar.bz2 libpanelappletmm.changes libpanelappletmm.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpanelappletmm.spec ++++++ # # spec file for package libpanelappletmm # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define soname 1 %define lib_version 2.6 %define package_version 2_6 Name: libpanelappletmm Version: 2.26.0 Release: 1 License: LGPLv2.1+ Summary: C++ bindings for libpanelapplet Url: http://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/ Group: System/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/2.26/%{name}-%{vers… BuildRequires: gcc-c++ BuildRequires: pkgconfig(gtkmm-2.4) BuildRequires: pkgconfig(gconfmm-2.6) BuildRequires: pkgconfig(libpanelapplet-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides C++ bindings to the GNOME panel applet API. %package -n %{name}-%{package_version}-%{soname} License: LGPLv2.1+ Summary: C++ bindings for libpanelapplet Group: System/Libraries %description -n %{name}-%{package_version}-%{soname} This package provides C++ bindings to the GNOME panel applet API. %package devel License: LGPLv2.1+ Summary: C++ bindings for libpanelapplet Group: Development/Libraries/C and C++ Requires: %{name}-%{package_version}-%{soname} = %{version} %description devel This package provides C++ bindings to the GNOME panel applet API. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %check make %{?_smp_mflags} check %clean test "%{buildroot}" != "/" && rm -rf "%{buildroot}" %post -n %{name}-%{package_version}-%{soname} -p /sbin/ldconfig %postun -n %{name}-%{package_version}-%{soname} -p /sbin/ldconfig %files -n %{name}-%{package_version}-%{soname} %defattr(-,root,root) %{_libdir}/libpanelappletmm-%{lib_version}.so.%{soname}* %files devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_includedir}/libpanelappletmm-%{lib_version}/ %{_libdir}/libpanelappletmm-%{lib_version}.so %{_libdir}/libpanelappletmm-%{lib_version}/ %{_libdir}/pkgconfig/libpanelappletmm-%{lib_version}.pc %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbi for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libdbi for openSUSE:Factory checked in at Tue Jan 25 10:07:43 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdbi/libdbi.changes 2010-12-15 17:17:56.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 15 16:19:01 CET 2010 - meissner(a)suse.de + +- cleanup, use RPM_OPT_FLAGS, --disable-static, no .la files + +------------------------------------------------------------------- +Wed Dec 15 16:08:27 CET 2010 - meissner(a)suse.de + +- initial import if libdbi, a database-independent abstraction layer in C, + similar to the DBI/DBD layer in Perl. + calling whatdependson for head-i586 New: ---- libdbi-0.8.3.tar.bz2 libdbi.changes libdbi.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbi.spec ++++++ # # spec file for package libdbi # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define lname libdbi0 Summary: Database Independent Abstraction Layer for C Name: libdbi Version: 0.8.3 Release: 1 Group: Development/Libraries License: LGPL Url: http://libdbi.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires %{lname} = %{version}-%{release} %description libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. Writing one generic set of code, programmers can leverage the power of multiple databases and multiple simultaneous database connections by using this framework. %package -n %{lname} Group: Development/Libraries Summary: Database Independent Abstraction Layer for C %description -n %{lname} libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. Writing one generic set of code, programmers can leverage the power of multiple databases and multiple simultaneous database connections by using this framework. %package devel License: LGPL Summary: Development files for libdbi (Database Independent Abstraction Layer for C) Group: Development/Libraries Requires: %{lname} = %{version} %description devel The libdbi-devel package contains the header files and documentation needed to develop applications with libdbi. %prep %setup -q %build %configure --disable-docs --disable-static make AM_CFLAGS="$RPM_OPT_FLAGS" %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir %buildroot make DESTDIR=$RPM_BUILD_ROOT install rm %buildroot/%{_libdir}/libdbi.la rm README.win32 %files -n %{lname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README* %{_libdir}/libdbi.so.* %files devel %defattr(-,root,root) %doc TODO doc/programmers-guide.pdf doc/programmers-guide/ doc/driver-guide.pdf doc/driver-guide/ %dir /usr/include/dbi /usr/include/dbi/dbi.h /usr/include/dbi/dbi-dev.h /usr/include/dbi/dbd.h %{_libdir}/libdbi.so %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libfm for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libfm for openSUSE:Factory checked in at Tue Jan 25 10:07:33 CET 2011. -------- --- libfm/libfm.changes 2010-10-20 11:36:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/libfm/libfm.changes 2011-01-24 14:48:33.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 22 23:27:41 UTC 2011 - gber(a)opensuse.org + +- added libfm-0.1.14-disable-gio-extension.patch in order to + disable the GIO extension implementing libfm-specific preferences + for URI scheme handlers for glib > 2.27 where the needed + extension point has been removed; preferred handlers set through + libfm/pref-apps.conf will be ignored and the new default glib + mechanism using x-scheme-handler will be used instead +- enabled gtk-doc generation and disabled parallel make which + breaks it + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libfm-0.1.14-disable-gio-extension.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm.spec ++++++ --- /var/tmp/diff_new_pack.Lzf45O/_old 2011-01-25 10:06:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Lzf45O/_new 2011-01-25 10:06:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libfm (Version 0.1.14_rc2) +# spec file for package libfm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: libfm Summary: A glib/gio-based lib used to develop file managers Version: 0.1.14_rc2 -Release: 2 +Release: 3 License: GPLv2 Group: Development/Libraries/C and C++ Url: http://www.lxde.org/ @@ -31,6 +31,7 @@ Patch1: %name-0.1.14-remove_rpath.patch # PATCH-FIX-UPSTREAM libfm-0.1.14-fix_sf3089624.patch <andrea(a)opensuse.org>- fixed "Filenames with spaces not supported in copy/paste" Patch2: %name-0.1.14-fix_sf3089624.patch +Patch3: %name-0.1.14-disable-gio-extension.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -40,6 +41,8 @@ BuildRequires: desktop-file-utils BuildRequires: update-desktop-files BuildRequires: fdupes +BuildRequires: autoconf +BuildRequires: gtk-doc %description A glib/gio-based lib used to develop file managers providing some @@ -90,26 +93,36 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build +autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %configure \ --disable-static \ - --enable-debug + --enable-debug \ + --enable-gtk-doc # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?jobs:-j%{jobs}} +%__make %install %makeinstall %__rm -rf %{buildroot}/%{_datadir}/locale/{es_VE,ur_PK} %__rm -f %{buildroot}%{_libdir}/*.la %__rm -f %{buildroot}/%{_libdir}/gio/modules/libgiofm.la +# these settings will have no effect without the gio extension so remove them +%if 0%{?suse_version} >= 1140 +%__rm -f %{buildroot}%{_sysconfdir}/xdg/%name/pref-apps.conf +%__rm -f %{buildroot}%{_bindir}/libfm-pref-apps +%__rm -f %{buildroot}%{_datadir}/applications/libfm-pref-apps.desktop +%else %suse_update_desktop_file libfm-pref-apps +%endif %find_lang %{name} %fdupes -s %{buildroot}/%{_datadir}/locale @@ -134,19 +147,23 @@ %files -f %name.lang %defattr(-,root,root) -%{_bindir}/libfm-pref-apps -%{_datadir}/applications/libfm-pref-apps.desktop %dir %{_sysconfdir}/xdg/%name %config %{_sysconfdir}/xdg/%name/%name.conf -%config %{_sysconfdir}/xdg/%name/pref-apps.conf %{_datadir}/mime/packages/%name.xml %dir %{_libdir}/%name %{_libdir}/%name/gnome-terminal +%if 0%{?suse_version} < 1140 +%config %{_sysconfdir}/xdg/%name/pref-apps.conf +%{_bindir}/libfm-pref-apps +%{_datadir}/applications/libfm-pref-apps.desktop +%endif %files -n libfm0 %defattr(-,root,root) %{_libdir}/libfm.so.* +%if 0%{?suse_version} < 1140 %{_libdir}/gio/modules/libgiofm.so +%endif %files -n libfm-gtk0 %defattr(-,root,root) ++++++ libfm-0.1.14-disable-gio-extension.patch ++++++ diff -ur libfm-0.1.15.orig/configure.ac libfm-0.1.15/configure.ac --- libfm-0.1.15.orig/configure.ac 2010-11-07 12:12:50.000000000 +0100 +++ libfm-0.1.15/configure.ac 2011-01-18 14:46:20.000000000 +0100 @@ -53,6 +53,9 @@ AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) +PKG_CHECK_MODULES(GIO_UNIX_227, [gio-unix-2.0 < 2.27.0], gio_below_227=yes, gio_below_227=no) +AM_CONDITIONAL(BUILD_GIO_EXTENSION, test "$gio_below_227" = "yes") + gmodule_modules="gmodule-2.0" PKG_CHECK_MODULES(GMODULE, [$gmodule_modules]) AC_SUBST(GMODULE_CFLAGS) @@ -106,9 +109,11 @@ CPPFLAGS="$CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" fi +if test "$gio_below_227" = "yes"; then # GIO extension module giomodulesdir=$libdir/gio/modules AC_SUBST(giomodulesdir) +fi GETTEXT_PACKAGE=libfm Only in libfm-0.1.15: libfm-0.1.15-disable-gio-extension.patch diff -ur libfm-0.1.15.orig/src/Makefile.am libfm-0.1.15/src/Makefile.am --- libfm-0.1.15.orig/src/Makefile.am 2010-11-07 12:12:50.000000000 +0100 +++ libfm-0.1.15/src/Makefile.am 2011-01-18 14:26:48.000000000 +0100 @@ -276,6 +276,7 @@ endif +if BUILD_GIO_EXTENSION # GIO module implementing some extension points giomodules_LTLIBRARIES = libgiofm.la @@ -305,6 +306,7 @@ $(GIO_LIBS) \ $(INTLLIBS) \ $(NULL) +endif # GObject marshallers ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libcryptopp for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libcryptopp for openSUSE:Factory checked in at Tue Jan 25 10:05:51 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libcryptopp/libcryptopp.changes 2010-12-16 16:02:01.000000000 +0100 @@ -0,0 +1,31 @@ +------------------------------------------------------------------- +Thu Dec 16 14:40:17 UTC 2010 - andreas.hanke(a)gmx-topmail.de + +- Update to version 5.6.1: + - added support for AES-NI and CLMUL instruction sets in AES and + GMAC/GCM + - removed WAKE-CFB + - fixed several bugs in the SHA-256 x86/x64 assembly code: + * incorrect hash on non-SSE2 x86 machines on non-aligned input + * incorrect hash on x86 machines when input crosses 0x80000000 + * incorrect hash on x64 when compiled with GCC with optimizations + enabled + - fixed bugs in AES x86 and x64 assembly causing crashes in some MSVC + build configurations + - switched to a public domain implementation of MARS + - ported to MSVC 2010, GCC 4.5.1, Sun Studio 12u1, C++Builder 2010, + Intel C++ Compiler 11.1 + - renamed the MSVC DLL project to "cryptopp" for compatibility with + MSVC 2010 +- Changes to library packaging: + - update the interface number because there were ABI changes, now + matching the Debian package + - introduce a conflict with the PackMan package + - ship License.txt and Readme.txt + - drop the static library + +------------------------------------------------------------------- +Mon Aug 9 22:29:54 UTC 2010 - pascal.bleser(a)opensuse.org + +- initial package (5.6.0) + calling whatdependson for head-i586 New: ---- cryptopp561.tar.bz2 libcryptopp-shared.patch libcryptopp.changes libcryptopp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptopp.spec ++++++ # # spec file for package libcryptopp # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libcryptopp Version: 5.6.1 Release: 1 %define pkg_version 561 # This needs to be bumped manually with every ABI change since there is # no upstream interface version information. Please keep in sync with # Debian: http://packages.debian.org/en/source/experimental/libcrypto++ %define soname 9 Summary: Crypto++ Library # http://www.cryptopp.com/cryptopp%{pkg_version}.zip Source: cryptopp%{pkg_version}.tar.bz2 Patch1: libcryptopp-shared.patch Url: http://www.cryptopp.com Group: Development/Libraries/C and C++ License: Public Domain BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ libstdc++-devel BuildRequires: gcc glibc-devel make pkgconfig %description Crypto++ Library is a free C++ class library of cryptographic schemes. %package -n %{name}%{soname} Summary: Cryptographic Library for C++ Group: System/Libraries %description -n %{name}%{soname} Crypto++ Library is a free C++ class library of cryptographic schemes. %package -n %{name}-devel Summary: Cryptographic Library for C++ Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} # http://packman.links2linux.de/package/libcrypto++0 Conflicts: libcrypto++0 %description -n %{name}-devel Crypto++ Library is a free C++ class library of cryptographic schemes. %prep %setup -q -c "%{name}-%{version}" %patch1 %build %__make %{?jobs:-j%{jobs}} \ CXXFLAGS="-DNDEBUG %{optflags} -fpic -fPIC" \ DESTDIR="" \ PREFIX="%{_prefix}" \ LIB="%{_lib}" \ CXX="%__cxx" \ VERSION="%{soname}.0.0" \ MAJOR="%{soname}" \ all %install %__make \ DESTDIR="%{buildroot}" \ PREFIX="%{_prefix}" \ LIB="%{_lib}" \ CXX="%__cxx" \ VERSION="%{soname}.0.0" \ MAJOR="%{soname}" \ install %__rm -rf "%{buildroot}%{_bindir}" %check %__make test %post -n %{name}%{soname} -p /sbin/ldconfig %postun -n %{name}%{soname} -p /sbin/ldconfig %clean %{?buildroot:%__rm -rf "%{buildroot}"} %files -n %{name}%{soname} %defattr(-,root,root) %{_libdir}/libcryptopp.so.%{soname} %{_libdir}/libcryptopp.so.%{soname}.* %files -n %{name}-devel %defattr(-,root,root) %doc License.txt Readme.txt %{_includedir}/cryptopp %{_libdir}/libcryptopp.so %changelog ++++++ libcryptopp-shared.patch ++++++ --- GNUmakefile.orig 2010-08-09 14:22:42.000000000 +0200 +++ GNUmakefile 2010-12-16 15:58:54.174167505 +0100 @@ -1,7 +1,7 @@ CXXFLAGS = -DNDEBUG -g -O2 #CXXFLAGS = -g # -fPIC is supported. Please report any breakage of -fPIC as a bug. -# CXXFLAGS += -fPIC +CXXFLAGS += -fPIC # the following options reduce code size, but breaks link or makes link very slow on some systems # CXXFLAGS += -ffunction-sections -fdata-sections # LDFLAGS += -Wl,--gc-sections @@ -134,26 +134,29 @@ all: cryptest.exe test: cryptest.exe - ./cryptest.exe v + LD_LIBRARY_PATH=. ./cryptest.exe v clean: $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) install: - $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin - $(CP) *.h $(PREFIX)/include/cryptopp - $(CP) *.a $(PREFIX)/lib - $(CP) *.so $(PREFIX)/lib - $(CP) *.exe $(PREFIX)/bin + $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/$(LIB) $(DESTDIR)$(PREFIX)/bin + $(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp + $(CP) libcryptopp.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB) + ln -s libcryptopp.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libcryptopp.so.$(MAJOR) + ln -s libcryptopp.so.$(MAJOR) $(DESTDIR)$(PREFIX)/$(LIB)/libcryptopp.so + $(CP) *.exe $(DESTDIR)$(PREFIX)/bin libcryptopp.a: $(LIBOBJS) $(AR) $(ARFLAGS) $@ $(LIBOBJS) $(RANLIB) $@ libcryptopp.so: $(LIBOBJS) - $(CXX) -shared -o $@ $(LIBOBJS) + $(CXX) -shared -Wl,-soname,libcryptopp.so.$(MAJOR) -o libcryptopp.so.$(VERSION) $(LIBOBJS) $(LDFLAGS) $(LDLIBS) + ln -s libcryptopp.so.$(VERSION) libcryptopp.so.$(MAJOR) + ln -s libcryptopp.so.$(MAJOR) $@ -cryptest.exe: libcryptopp.a $(TESTOBJS) +cryptest.exe: libcryptopp.so $(TESTOBJS) $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) nolib: $(OBJS) # makes it faster to test changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 horde3 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package horde3 for openSUSE:Factory checked in at Tue Jan 25 10:05:04 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3/horde3.changes 2011-01-14 17:10:10.000000000 +0100 @@ -0,0 +1,79 @@ +------------------------------------------------------------------- +Thu Dec 16 11:03:04 UTC 2010 - lang(a)b1-systems.de + +- updated patch because it contained CVS info + +------------------------------------------------------------------- +Thu Dec 16 10:40:58 UTC 2010 - lang(a)b1-systems.de + +- updated to 3.3.11 +- Added the fatal on admin and finer grained admin privileges patch + +------------------------------------------------------------------- +Sat Oct 30 11:32:58 UTC 2010 - lang(a)b1-systems.de + +- made specfile more like those of the other horde packages +- added findlang to catch the .mo files +- removed kolab-related stuff which needs to go into a separate rpm +- added the finer grained administration patch + +------------------------------------------------------------------- +Mon Oct 25 13:47:55 UTC 2010 - lang(a)b1-systems.de + +- updated to 3.3.10 which runs on PHP 5.3 + +------------------------------------------------------------------- +Sat Oct 16 12:10:55 UTC 2010 - lang(a)b1-systems.de + +- adding restriction to php versions prior to 5.3 because there are some known issues which need to be fixed first + +- moving old changelog to changes file + +------------------------------------------------------------------- +Tue Oct 12 12:00:00 UTC 2010 - lang(a)b1-systems.de + +- expanded horde-3.3.9-php5_exec.patch to new files +- updated to version 3.3.9 +- de-fuzz patch to fix build on 11.3+ + +------------------------------------------------------------------- +Tue Nov 03 12:00:00 UTC 2009 - rbos(a)opensuse.org + +- Updated to version 3.3.5 +- Updated patch horde-3.1.3-php5_exec.patch to horde-3.3.5-php5_exec.patch + to match the current horde version + +------------------------------------------------------------------- +Sun Mar 01 12:00:00 UTC 2009 - rbos(a)opensuse.org + +- Removed the link from /srv/www/htdocs/horde/lib to /usr/share/php5 + And added post and postun scripts to add or to remove the directory + /srv/www/htdocs/horde/lib to include_path in the php.ini file to compensate + for the removed links + +------------------------------------------------------------------- +Sat Feb 21 12:00:00 UTC 2009 - rbos(a)opensuse.org + +- updated to version 3.3.3 + +------------------------------------------------------------------- +Tue Dec 23 12:00:00 UTC 2008 - rbos(a)opensuse.org + +- Required rpm php-pear-mail_mime changed to php5-pear-mail_mime + +------------------------------------------------------------------- +Sun Dec 21 12:00:00 UTC 2008 - rbos(a)opensuse.org + +- Made this package the owner of the directory /usr/share/php5/PEAR/Horde, to + prevent rpmlint errors in other package builds + +------------------------------------------------------------------- +Sun Dec 07 12:00:00 UTC 2008 - rbos(a)opensuse.org + +- Ensure that the directory %%{peardir}/Horde is owned by this package + +------------------------------------------------------------------- +Sat Dec 06 12:00:00 2008 - rbos(a)opensuse.org + +- Version 3.3 + calling whatdependson for head-i586 New: ---- horde-3.1.2-log.patch horde-3.2-rc1-usr_local.patch horde-3.3.11.tar.bz2 horde-3.3.9-php5_exec.patch horde-fatal-on-admin-3.3.11.patch horde-finer-grained-admin-privileges.patch horde3.changes horde3.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3.spec ++++++ # # spec file for package horde3 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _phpdir php5 %define peardir %(pear config-get php_dir 2> /dev/null) %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde Name: horde3 Summary: Core Pieces for Running H3 Web Applications Version: 3.3.11 Release: 1 Url: http://www.horde.org/ License: GPLv2+ Group: Productivity/Networking/Web/Utilities Requires: mod_php_any Requires: php-gettext Requires: php-mcrypt Requires: php-imap Requires: php-pear Requires: php-pear-log Requires: php-session Requires: php-dom Requires: php5 Requires: php-pear-auth_sasl Requires: php-pear-date Requires: php-pear-file Requires: php-pear-mail Requires: php5-pear-mail_mime Requires: php5-pear-db Requires: php5-pear-mdb2 Requires: php5-pear-net_imap Requires: php5-pear-services_weather Requires: php5-pear-soap Requires: php5-pear-text_captcha Requires: php5-pear-text_figlet # this is atm provided by horde itself #Requires: php5-pear-text_diff Requires: php5-pear-http_request Requires: php5-pear-services_weather Requires: php5-pear-xml_svg Source0: horde-%{version}.tar.bz2 ############################ Patch0: horde-3.1.2-log.patch Patch1: horde-fatal-on-admin-3.3.11.patch Patch2: horde-finer-grained-admin-privileges.patch Patch3: horde-3.2-rc1-usr_local.patch Patch4: horde-3.3.9-php5_exec.patch BuildRequires: apache2-devel # This check is still needed for SLE-10-SP2 %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif BuildRequires: pcre-devel BuildRequires: php5-pear BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description These are the core pieces of the Horde suite of Web applications. This package is needed to run any of the other programs, such as IMP. Authors: -------- Chuck Hagenbuch <chuck(a)horde.org> Jan Schneider <jan(a)horde.org> Michael Slusarz <slusarz(a)horde.org> %prep %setup %setup -qn horde-%{version} %patch0 %patch1 %patch2 %patch3 %patch4 -p1 # Remove the .orig files that are created by the above patch' commands find -name "*.orig" -exec rm {} \; %build : if the following command fails, then apache dependencies are not met /usr/sbin/apxs2 -q datadir >/dev/null cd config for i in *.dist; do %__mv $i ${i%.dist} done %install %__mkdir_p %{buildroot}%{_hordedir} %__cp -r ./* %{buildroot}%{_hordedir} %__rm -rf %{buildroot}%{_hordedir}/{docs,README,LICENSE} %if 0%{?sles_version} != 10 %fdupes %buildroot%{_hordedir} %endif %find_lang horde %__install -d %{buildroot}/var/log/horde # The following files are removed, because they are now provided # by the packages: horde-auth, horde-group, horde-prefs, kolab-filter, # kolab-format, kolab-freebusy, kolab-server and kolab-storage. # # The following files are provided by horde, it seems that should # not be the case. # Horde/Kolab/Storage/Session.php # Horde/Prefs/kolab_imap.php # Horde/Share/kolab.php %__rm -rf %{buildroot}%{_hordedir}/lib/Horde/Kolab # prevent rpmlint warning / errors %if 0%{?suse_version} > 1020 %fdupes %{buildroot}%{_hordedir}/admin %fdupes %{buildroot}%{_hordedir}/js %fdupes %{buildroot}%{_hordedir}/lib %fdupes %{buildroot}%{_hordedir}/po %fdupes %{buildroot}%{_hordedir}/themes %fdupes %{buildroot}%{_hordedir}/scripts %fdupes %{buildroot}%{_hordedir}/templates %fdupes %{buildroot}%{_hordedir}/docs %fdupes %{buildroot}%{_hordedir}/services %fdupes %{buildroot}%{_hordedir}/rpc %fdupes %{buildroot}%{_hordedir}/util %endif %__install -d -m 755 %{buildroot}%{peardir}/Horde %find_lang horde %clean %__rm -rf %{buildroot} %files -f horde.lang %defattr(-, root, root) %doc README docs %doc %{_hordedir}/COPYING %dir %{_hordedir} %{_hordedir}/locale/.htaccess %{_hordedir}/locale/en_US/help.xml %{_hordedir}/admin %{_hordedir}/js %{_hordedir}/lib %{_hordedir}/po %dir %{_hordedir}/locale %dir %{_hordedir}/locale/en_US %{_hordedir}/scripts %{_hordedir}/services %{_hordedir}/templates %{_hordedir}/themes %{_hordedir}/util %{_hordedir}/rpc %{_hordedir}/*.php %attr(0750, wwwrun, www) %dir %{_hordedir}/config %attr(0640, root, www) %config(noreplace) %{_hordedir}/config/.htaccess %attr(0640, wwwrun, www) %config(noreplace) %{_hordedir}/config/*.php %attr(0640, wwwrun, www) %config(noreplace) %{_hordedir}/config/*.xml %attr(0750, wwwrun, www) %dir %{_hordedir}/config/registry.d %attr(0640, wwwrun, www) %{_hordedir}/config/registry.d/README %attr(0750, wwwrun, www) %dir /var/log/horde %post if [[ "$1" == 1 ]]; then # Horde is not yet installed on the system if ! grep -q "^include_path.*/srv/www/htdocs/horde/lib" /etc/php5/cli/php.ini; then # The directory /srv/www/htdocs/horde/lib, must be placed before # /usr/share/php5/PEAR otherwise applications will fail eval $(grep -w ^include_path /etc/php5/cli/php.ini | tr -d " ") for D in $(tr ":" " " <<< $include_path); do if [[ $D == "/usr/share/php5/PEAR" ]]; then INCLUDE_PATH="$INCLUDE_PATH:/srv/www/htdocs/horde/lib" fi INCLUDE_PATH="$INCLUDE_PATH:$D" done # Replace the include_path and remove the ":" at the beginning of the line cp /etc/php5/cli/php.ini /etc/php5/cli/php.ini-rpm-%{version}-%{release} sed -i "s,^include_path = .*,include_path = \"${INCLUDE_PATH##:}\"," /etc/php5/cli/php.ini fi fi %postun if [[ "$1" == 0 ]]; then # Horde is removed from the system if grep -qw /srv/www/htdocs/horde/lib /etc/php5/cli/php.ini; then cp /etc/php5/cli/php.ini /etc/php5/cli/php.ini-rpm-%{version}-%{release}-remove sed -i 's,/srv/www/htdocs/horde/lib:*,,' /etc/php5/cli/php.ini fi fi %changelog ++++++ horde-3.1.2-log.patch ++++++ Index: config/conf.xml =================================================================== --- config/conf.xml.orig +++ config/conf.xml @@ -797,7 +797,7 @@ <case name="file" desc="File"> <configstring name="name" desc="Path to the log - file">/tmp/horde.log</configstring> + file">/var/log/horde/horde.log</configstring> <configsection name="params"> <configboolean name="append" required="false" desc="Should new log entries be appended to an existing log file? If this is false, new log ++++++ horde-3.2-rc1-usr_local.patch ++++++ Index: config/mime_drivers.php.dist =================================================================== --- config/mime_drivers.php.dist.orig +++ config/mime_drivers.php.dist @@ -405,7 +405,7 @@ $mime_drivers['horde']['msword'] = array * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/ */ $mime_drivers['horde']['msexcel'] = array( - 'location' => '/usr/local/bin/xlhtml', + 'location' => '/usr/bin/xlhtml', 'inline' => false, 'handles' => array( 'application/vnd.ms-excel', 'application/msexcel', @@ -423,7 +423,7 @@ $mime_drivers['horde']['msexcel'] = arra * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/ */ $mime_drivers['horde']['mspowerpoint'] = array( - 'location' => '/usr/local/bin/ppthtml', + 'location' => '/usr/bin/ppthtml', 'inline' => false, 'handles' => array( 'application/vnd.ms-powerpoint', 'application/mspowerpoint' ++++++ horde-3.3.9-php5_exec.patch ++++++ Index: horde-3.3.11/admin/setup/scripts.php =================================================================== --- horde-3.3.11.orig/admin/setup/scripts.php +++ horde-3.3.11/admin/setup/scripts.php @@ -48,7 +48,7 @@ $data = ''; if ($setup == 'conf' && $type == 'php') { /* A bit ugly here, save PHP code into a string for creating the script * to be run at the command prompt. */ - $data = '#!/usr/bin/php' . "\n"; + $data = '#!/usr/bin/php5' . "\n"; $data .= '<?php' . "\n"; foreach ($_SESSION['_config'] as $app => $php) { $path = $registry->get('fileroot', $app) . '/config'; Index: horde-3.3.11/po/README =================================================================== --- horde-3.3.11.orig/po/README +++ horde-3.3.11/po/README @@ -24,7 +24,7 @@ discussions of i18n and l10n questions a ``horde/po`` your working directory in order to run the commands quoted below. But you can run the script from any directory, just adapt the directory to the script. See _Prerequisites if your PHP binary is not located in -``/usr/bin/php``. +``/usr/bin/php5``. For a list of available commands run:: @@ -48,7 +48,7 @@ PHP executable to be at ``/usr/bin/php`` place, either edit the first line of ``translation.php`` to reflect your location or call the script like:: - /usr/local/bin/php translation.php. + /usr/local/bin/php5 translation.php. You'll need the `gettext`_ package version 0.12 or greater. Index: horde-3.3.11/po/translation.php =================================================================== --- horde-3.3.11.orig/po/translation.php +++ horde-3.3.11/po/translation.php @@ -1,4 +1,4 @@ -#!/usr/bin/php -q +#!/usr/bin/php5 -q <?php /** * Translation helper application for the Horde framework. Index: horde-3.3.11/scripts/upgrades/migrate_user_categories.php =================================================================== --- horde-3.3.11.orig/scripts/upgrades/migrate_user_categories.php +++ horde-3.3.11/scripts/upgrades/migrate_user_categories.php @@ -1,4 +1,4 @@ -#!/usr/bin/php -q +#!/usr/bin/php5 -q <?php /** * $Horde: horde/scripts/upgrades/migrate_user_categories.php,v 1.1.2.3 2008-04-08 14:29:47 chuck Exp $ Index: horde-3.3.11/scripts/upgrades/move_history_out_of_datatree.php =================================================================== --- horde-3.3.11.orig/scripts/upgrades/move_history_out_of_datatree.php +++ horde-3.3.11/scripts/upgrades/move_history_out_of_datatree.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * $Horde: horde/scripts/upgrades/move_history_out_of_datatree.php,v 1.3.2.3 2007-12-20 15:03:04 jan Exp $ Index: horde-3.3.11/scripts/upgrades/convert_datatree_perms_to_sql.php =================================================================== --- horde-3.3.11.orig/scripts/upgrades/convert_datatree_perms_to_sql.php +++ horde-3.3.11/scripts/upgrades/convert_datatree_perms_to_sql.php @@ -1,4 +1,4 @@ -#!/usr/bin/php -q +#!/usr/bin/php5 -q <?php /** * $Horde: horde/scripts/upgrades/convert_datatree_perms_to_sql.php,v 1.1.2.1 2008-05-02 16:46:01 jan Exp $ Index: horde-3.3.11/scripts/upgrades/convert_datatree_groups_to_sql.php =================================================================== --- horde-3.3.11.orig/scripts/upgrades/convert_datatree_groups_to_sql.php +++ horde-3.3.11/scripts/upgrades/convert_datatree_groups_to_sql.php @@ -1,4 +1,4 @@ -#!/usr/bin/php -q +#!/usr/bin/php5 -q <?php /** * $Horde: horde/scripts/upgrades/convert_datatree_groups_to_sql.php,v 1.1.2.2 2009-07-20 11:36:02 jan Exp $ Index: horde-3.3.11/scripts/import_squirrelmail_file_prefs.php =================================================================== --- horde-3.3.11.orig/scripts/import_squirrelmail_file_prefs.php +++ horde-3.3.11/scripts/import_squirrelmail_file_prefs.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports SquirrelMail file-based preferences into Horde. Index: horde-3.3.11/scripts/import_squirrelmail_sql_prefs.php =================================================================== --- horde-3.3.11.orig/scripts/import_squirrelmail_sql_prefs.php +++ horde-3.3.11/scripts/import_squirrelmail_sql_prefs.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports SquirrelMail database preferences into Horde. ++++++ horde-fatal-on-admin-3.3.11.patch ++++++ Index: admin/alarms.php =================================================================== --- admin/alarms.php.orig +++ admin/alarms.php @@ -17,7 +17,7 @@ require_once 'Horde/Form.php'; require_once 'Horde/Variables.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } $horde_alarm = Horde_Alarm::factory(); Index: admin/datatree.php =================================================================== --- admin/datatree.php.orig +++ admin/datatree.php @@ -34,7 +34,7 @@ require_once 'Horde/Tree.php'; require_once 'Horde/DataTree.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } $tree = &Horde_Tree::factory('datatree', 'html'); Index: admin/groups.php =================================================================== --- admin/groups.php.orig +++ admin/groups.php @@ -16,7 +16,7 @@ require_once 'Horde/Group.php'; require_once 'Horde/Tree.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } $groups = &Group::singleton(); Index: admin/perms/addchild.php =================================================================== --- admin/perms/addchild.php.orig +++ admin/perms/addchild.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } /* Set up the form variables. */ Index: admin/perms/delete.php =================================================================== --- admin/perms/delete.php.orig +++ admin/perms/delete.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } /* Set up the form variables. */ Index: admin/perms/edit.php =================================================================== --- admin/perms/edit.php.orig +++ admin/perms/edit.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } /* Set up the form variables. */ Index: admin/perms/index.php =================================================================== --- admin/perms/index.php.orig +++ admin/perms/index.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } $perm_id = Util::getFormData('perm_id'); Index: admin/phpshell.php =================================================================== --- admin/phpshell.php.orig +++ admin/phpshell.php @@ -14,7 +14,7 @@ require_once HORDE_BASE . '/lib/base.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } $title = _("PHP Shell"); Index: admin/sessions.php =================================================================== --- admin/sessions.php.orig +++ admin/sessions.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php require_once 'Horde/SessionHandler.php'; if (!Auth::isAdmin()) { - Horde::authenticationFailureRedirect(); + Horde::fatal('Forbidden.', __FILE__, __LINE__); } $type = !empty($conf['sessionhandler']['type']) ? $conf['sessionhandler']['type'] : 'none'; ++++++ horde-finer-grained-admin-privileges.patch ++++++ Index: admin/alarms.php =================================================================== --- admin/alarms.php.orig +++ admin/alarms.php @@ -16,7 +16,7 @@ require_once 'Horde/Alarm.php'; require_once 'Horde/Form.php'; require_once 'Horde/Variables.php'; -if (!Auth::isAdmin()) { +if (!Auth::isAdmin() && !$GLOBALS['perms']->hasPermission('horde:administration:admin_alarms', Auth::getAuth(), true)) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/cmdshell.php =================================================================== --- admin/cmdshell.php.orig +++ admin/cmdshell.php @@ -13,7 +13,7 @@ @define('HORDE_BASE', dirname(__FILE__) . '/..'); require_once HORDE_BASE . '/lib/base.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_cmdshell', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/datatree.php =================================================================== --- admin/datatree.php.orig +++ admin/datatree.php @@ -33,7 +33,7 @@ require_once HORDE_BASE . '/lib/base.php require_once 'Horde/Tree.php'; require_once 'Horde/DataTree.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_datatree', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/groups.php =================================================================== --- admin/groups.php.orig +++ admin/groups.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php require_once 'Horde/Group.php'; require_once 'Horde/Tree.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_groups', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/perms/addchild.php =================================================================== --- admin/perms/addchild.php.orig +++ admin/perms/addchild.php @@ -14,7 +14,7 @@ @define('HORDE_BASE', dirname(__FILE__) . '/../..'); require_once HORDE_BASE . '/lib/base.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_perms', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/perms/delete.php =================================================================== --- admin/perms/delete.php.orig +++ admin/perms/delete.php @@ -14,7 +14,7 @@ @define('HORDE_BASE', dirname(__FILE__) . '/../..'); require_once HORDE_BASE . '/lib/base.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_perms', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/perms/edit.php =================================================================== --- admin/perms/edit.php.orig +++ admin/perms/edit.php @@ -14,7 +14,7 @@ @define('HORDE_BASE', dirname(__FILE__) . '/../..'); require_once HORDE_BASE . '/lib/base.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && !$GLOBALS['perms']->hasPermission('horde:administration:admin_perms', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/perms/index.php =================================================================== --- admin/perms/index.php.orig +++ admin/perms/index.php @@ -14,7 +14,7 @@ @define('HORDE_BASE', dirname(__FILE__) . '/../..'); require_once HORDE_BASE . '/lib/base.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_perms', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/phpshell.php =================================================================== --- admin/phpshell.php.orig +++ admin/phpshell.php @@ -13,7 +13,7 @@ @define('HORDE_BASE', dirname(__FILE__) . '/..'); require_once HORDE_BASE . '/lib/base.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_phpshell', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/sessions.php =================================================================== --- admin/sessions.php.orig +++ admin/sessions.php @@ -14,7 +14,7 @@ require_once HORDE_BASE . '/lib/base.php'; require_once 'Horde/SessionHandler.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin() && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_sessions', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/setup/config.php =================================================================== --- admin/setup/config.php.orig +++ admin/setup/config.php @@ -18,7 +18,7 @@ require_once 'Horde/Form/Renderer.php'; require_once 'Horde/Config.php'; require_once 'Horde/Variables.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_configuration', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/setup/diff.php =================================================================== --- admin/setup/diff.php.orig +++ admin/setup/diff.php @@ -19,7 +19,7 @@ require_once 'Horde/Template.php'; include_once 'Text/Diff.php'; include_once 'Text/Diff/Renderer.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_configuration', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/setup/index.php =================================================================== --- admin/setup/index.php.orig +++ admin/setup/index.php @@ -15,7 +15,7 @@ require_once HORDE_BASE . '/lib/base.php require_once 'Horde/Template.php'; require_once 'Horde/Form/Renderer.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_configuration', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/sqlshell.php =================================================================== --- admin/sqlshell.php.orig +++ admin/sqlshell.php @@ -14,7 +14,7 @@ require_once HORDE_BASE . '/lib/base.php'; require_once 'DB.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_sqlshell', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } Index: admin/user.php =================================================================== --- admin/user.php.orig +++ admin/user.php @@ -17,9 +17,10 @@ require_once 'Horde/Variables.php'; require_once 'Horde/Form/Renderer.php'; require_once 'Horde/Variables.php'; -if (!Auth::isAdmin()) { +if ((!Auth::isAdmin()) && (!$GLOBALS['perms']->hasPermission('horde:administration:admin_users', Auth::getAuth(), true))) { Horde::fatal('Forbidden.', __FILE__, __LINE__); } + $auth = &Auth::singleton($conf['auth']['driver']); if ($conf['signup']['allow'] && $conf['signup']['approve']) { Index: services/portal/sidebar.php =================================================================== --- services/portal/sidebar.php.orig +++ services/portal/sidebar.php @@ -113,15 +113,13 @@ function buildMenu() $menu[$app] = $params; } - // Add the administration menu if the user is an admin. - if (Auth::isAdmin()) { - $menu['administration'] = array('name' => _("Administration"), - 'icon' => $registry->getImageDir() . '/administration.png', - 'status' => 'heading'); - - $list = $registry->callByPackage('horde', 'admin_list'); - if (!is_a($list, 'PEAR_Error')) { - foreach ($list as $method => $vals) { + // determine which administration modules belong into the list of administration links + $list = $registry->callByPackage('horde', 'admin_list'); + $count_links = 0; + if (!is_a($list, 'PEAR_Error')) { + foreach ($list as $method => $vals) { + if ((Auth::isAdmin()) || ($GLOBALS['perms']->hasPermission('horde:administration:admin_' . $method, Auth::getAuth(), true))) { + $count_links++; $name = Horde::stripAccessKey($vals['name']); $icon = isset($vals['icon']) ? $registry->getImageDir() . '/' . $vals['icon'] : $registry->get('icon'); @@ -135,6 +133,13 @@ function buildMenu() } } } + // only show administration heading when there are links to display (implies isAdmin or user has some admin privilege + if ($count_links) { + $menu['administration'] = array('name' => _("Administration"), + 'icon' => $registry->getImageDir() . '/administration.png', + 'status' => 'heading'); + } + if (Horde::showService('options') && $conf['prefs']['driver'] != '' && $conf['prefs']['driver'] != 'none') { Index: templates/admin/menu.inc =================================================================== --- templates/admin/menu.inc.orig +++ templates/admin/menu.inc @@ -4,9 +4,11 @@ $menu = new Menu(HORDE_MENU_MASK_NONE); $list = $registry->callByPackage('horde', 'admin_list'); if (!is_a($list, 'PEAR_Error')) { - foreach ($list as $vals) { - $img = isset($vals['icon']) ? $registry->getImageDir() . '/' . $vals['icon'] : $registry->get('icon'); - $menu->add(Horde::url($registry->applicationWebPath($vals['link'])), $vals['name'], $img, ''); + foreach ($list as $key => $vals) { + if ((Auth::isAdmin()) || ($GLOBALS['perms']->hasPermission('horde:administration:admin_' . $key, Auth::getAuth(), true))) { + $img = isset($vals['icon']) ? $registry->getImageDir() . '/' . $vals['icon'] : $registry->get('icon'); + $menu->add(Horde::url($registry->applicationWebPath($vals['link'])), $vals['name'], $img, ''); + } } } echo $menu->render(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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