February 2012 - openSUSE Commits - openSUSE Mailing Lists

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2012-02-29 14:13:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper", Maintainer is "ma(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2012-02-16 15:04:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2012-02-29 14:13:17.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 23 12:22:09 CET 2012 - ma(a)suse.de + +- Fix augeas lense enforcing a non empty anonymous section (bnc#748144) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper-1.7.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.7.0.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.7.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zsync for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package zsync for openSUSE:Factory checked in at 2012-02-29 14:13:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zsync (Old) and /work/SRC/openSUSE:Factory/.zsync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zsync", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/zsync/zsync.changes 2011-09-23 12:53:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zsync.new/zsync.changes 2012-02-29 14:13:06.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 6 13:06:18 UTC 2011 - coolo(a)suse.com + +- zsync is distributed under Artistic-2.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zsync.spec ++++++ --- /var/tmp/diff_new_pack.zSgPQG/_old 2012-02-29 14:13:07.000000000 +0100 +++ /var/tmp/diff_new_pack.zSgPQG/_new 2012-02-29 14:13:07.000000000 +0100 @@ -15,19 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: zsync Version: 0.6.2 -Release: 12 +Release: 0 Source: http://zsync.moria.org.uk/download/zsync-%{version}.tar.bz2 Url: http://zsync.moria.org.uk/ -Group: Productivity/Networking/Other -License: Artistic 2.0beta4 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc glibc-devel make +BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: glibc-devel +BuildRequires: make Summary: Client-side Implementation of the Rsync Algorithm over HTTP +License: Artistic-2.0 +Group: Productivity/Networking/Other # PATCH-FIX-OPENSUSE avoid build time in generated files for build compare Patch: zsync-no-build-date.patch @@ -41,9 +41,7 @@ compressed to further reduce download times. %package devel -License: Artistic Requires: %{name} == %{version} -Group: Productivity/Networking/Other Summary: Client-side Implementation of the Rsync Algorithm over HTTP %description devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2012-02-29 14:12:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "mvidner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2012-01-25 11:09:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2012-02-29 14:12:53.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Feb 27 09:38:49 UTC 2012 - mfilka(a)suse.com + +- installer's proxy config stored on installed system - bnc#693640 +- 2.22.4 + +------------------------------------------------------------------- +Thu Feb 23 08:52:06 UTC 2012 - mfilka(a)suse.com + +- added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 +- fixed testsuite +- 2.22.3 + +------------------------------------------------------------------- +Tue Jan 31 17:36:27 CET 2012 - mvidner(a)suse.cz + +- Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12) + +------------------------------------------------------------------- Old: ---- yast2-network-2.22.2.tar.bz2 New: ---- yast2-network-2.22.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.01MTPY/_old 2012-02-29 14:12:55.000000000 +0100 +++ /var/tmp/diff_new_pack.01MTPY/_new 2012-02-29 14:12:55.000000000 +0100 @@ -16,22 +16,22 @@ # + Name: yast2-network -Version: 2.22.2 +Version: 2.22.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-network-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0+ # should be required by devtools -BuildRequires: perl-XML-Writer -BuildRequires: pkgconfig -BuildRequires: rpm +BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files +BuildRequires: yast2-devtools yast2-testsuite BuildRequires: yast2-country -BuildRequires: yast2-devtools BuildRequires: yast2-installation >= 2.15.27 -BuildRequires: yast2-testsuite # NetworkInterfaces::Write should write ifcfgs only once # Wizard::SetDesktopTitleAndIcon @@ -62,12 +62,10 @@ Conflicts: yast2-core < 2.10.6 Summary: YaST2 - Network Configuration -License: GPL-2.0+ -Group: System/YaST %package devel-doc -Summary: YaST2 - Developer documentation for yast2-network Group: System/YaST +Summary: YaST2 - Developer documentation for yast2-network %description This package contains the YaST2 component for network configuration. ++++++ yast2-network-2.22.2.tar.bz2 -> yast2-network-2.22.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/VERSION new/yast2-network-2.22.4/VERSION --- old/yast2-network-2.22.2/VERSION 2012-01-24 16:51:48.000000000 +0100 +++ new/yast2-network-2.22.4/VERSION 2012-02-27 10:38:41.000000000 +0100 @@ -1 +1 @@ -2.22.2 +2.22.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/configure.in new/yast2-network-2.22.4/configure.in --- old/yast2-network-2.22.2/configure.in 2012-01-24 16:51:49.000000000 +0100 +++ new/yast2-network-2.22.4/configure.in 2012-02-23 08:52:13.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-network, 2.22.2, http://bugs.opensuse.org/, yast2-network) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/clients/proxy.ycp new/yast2-network-2.22.4/src/clients/proxy.ycp --- old/yast2-network-2.22.2/src/clients/proxy.ycp 2012-01-24 16:51:47.000000000 +0100 +++ new/yast2-network-2.22.4/src/clients/proxy.ycp 2012-02-23 11:37:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Proxy client * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: proxy.ycp 65909 2011-09-22 09:25:27Z visnov $ + * $Id: proxy.ycp 67533 2012-02-23 10:37:07Z mfilka $ * * Main file for proxy configuration. * Uses all other files. @@ -44,10 +44,10 @@ /* main ui function */ any ret = ProxyMainDialog(true); y2debug("ret == %1", ret); - + if (ret == `next && Modified ()) Proxy::Write(); - + UI::CloseDialog(); return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/clients/save_network.ycp new/yast2-network-2.22.4/src/clients/save_network.ycp --- old/yast2-network-2.22.2/src/clients/save_network.ycp 2012-01-24 16:51:47.000000000 +0100 +++ new/yast2-network-2.22.4/src/clients/save_network.ycp 2012-02-27 08:56:37.000000000 +0100 @@ -45,14 +45,14 @@ * @return true on success */ define boolean ReadInstallInfItem(path install_inf, string item, string var) { - if(item == nil || item == "" || var == nil || var == "") + if(item == nil || item == "" || var == nil || var == "") return false; string val = (string) SCR::Read(add(install_inf, var)); - if(val == nil) + if(val == nil) return false; - if(val != "") + if(val != "") InstallInf[item] = val; return true; @@ -130,7 +130,8 @@ ReadInstallInfItem(install_inf, "nisdomain", "NISDomain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); - ReadInstallInfItem(install_inf, "proxy", "Proxy"); + ReadInstallInfItem(install_inf, "proxyUrl", "ProxyUrl"); + ReadInstallInfItem(install_inf, "proxyProto", "ProxyProto"); // ReadInstallInfItem(install_inf, "options", "Options"); // OSAHwAddr parameter s390 ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); @@ -439,12 +440,22 @@ } // create proxy sysconfig file - if (size(InstallInf["proxy"]:"")>0) { - y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); - map ex = Proxy::Export(); + if( (size(InstallInf["proxyProto"]:"")>0) && + (size( InstallInf["proxyUrl"]:"") >0) ) { + y2milestone("Writing proxy settings: %1", InstallInf["proxyUrl"]:""); + Proxy::Read(); + map ex = Proxy::Export(); + + // bnc#693640 - update Proxy module's configuration + // username and password is stored in url because it is handled by linuxrc this way and it is impossible + // to distinguish how the user inserted it (separate or as a part of url?) + ex[ InstallInf[ "proxyProto"]:"" + "_proxy"] = InstallInf[ "proxyUrl"]:""; + Proxy::Import( ex ); Proxy::Write(); + + y2debug( "Written proxy settings: %1", ex); } // create defaultdomain if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/modules/NetworkStorage.ycp new/yast2-network-2.22.4/src/modules/NetworkStorage.ycp --- old/yast2-network-2.22.2/src/modules/NetworkStorage.ycp 2012-01-24 16:51:48.000000000 +0100 +++ new/yast2-network-2.22.4/src/modules/NetworkStorage.ycp 2012-02-06 08:03:51.000000000 +0100 @@ -36,26 +36,7 @@ * @return root dev over network: `no `iscsi `nfs `fcoe */ global symbol isDiskOnNetwork(string device) { - y2milestone("begin isDiskOnNetwork(%1) function", device); - if (device=="nfs") { - return `nfs; - } - if (size(device)==0) { - y2error("Empty parameter for isDiskOnNetwork() function"); - return `no; - } - - symbol network_based = Storage::IsDeviceOnNetwork(device); - - // test for nfs (bnc#384420) - if (network_based == `no) { - string space="[[:space:]]"; - if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ - y2milestone("device %1 is network based : %2", device, network_based); - network_based = `nfs; - } - } - return network_based; + return Storage::IsDeviceOnNetwork(device); } global list<string> getiBFTDevices() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/src/services/proxy.ycp new/yast2-network-2.22.4/src/services/proxy.ycp --- old/yast2-network-2.22.2/src/services/proxy.ycp 2012-01-24 16:51:47.000000000 +0100 +++ new/yast2-network-2.22.4/src/services/proxy.ycp 2012-02-23 11:37:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Proxy configuration * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: proxy.ycp 61682 2010-04-13 10:42:28Z mzugec $ + * $Id: proxy.ycp 67533 2012-02-23 10:37:07Z mfilka $ */ { @@ -336,6 +336,13 @@ return validate; } + +boolean UrlContainPassword( string url) +{ + map ret = URL::Parse( url); + + return size( ret[ "pass"]:"") > 0 ; +} /** * Proxy dialog * @param standalone true if not run from another ycp client @@ -481,8 +488,8 @@ UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername); UI::ChangeWidget(`id(`frame1), `Enabled, enabled); UI::ChangeWidget(`id(`frame2), `Enabled, enabled); - if ( !Mode::installation() ) - UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; + if ( !Mode::installation() ) + UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; InitSameProxy(); if(enabled == true) UI::SetFocus(`id(`http)); @@ -520,16 +527,30 @@ if(https == prefill) https = ""; if(ftp == prefill) ftp = ""; - if(enabled == false) - break; - else { - if((http == "") && (https == "") && (ftp == "") ){ - /* Popup error text - http, https and ftp proxy URLs are blank */ - if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. + if(enabled == false) + break; + if((http == "") && (https == "") && (ftp == "") ){ + /* Popup error text - http, https and ftp proxy URLs are blank */ + if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. Really use these settings?"))) - continue; - } - } + continue; + } + // bnc#694582 - username and password in URL + else + { + boolean password_inside = UrlContainPassword( http) || + UrlContainPassword( https) || + UrlContainPassword( ftp); + + if( (password_inside) && ( ret != "test_proxy")) + { + if(!Popup::ContinueCancel(_("Security warning: +Username and password will be stored unencrypted +in a worldwide readable plaintext file. +Really use these settings?"))) + continue; + } + } /* check_* */ if(user == "" && pass != "") { /* Popup::Error text */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.2/testsuite/tests/runtime.ycp new/yast2-network-2.22.4/testsuite/tests/runtime.ycp --- old/yast2-network-2.22.2/testsuite/tests/runtime.ycp 2012-01-24 16:51:48.000000000 +0100 +++ new/yast2-network-2.22.4/testsuite/tests/runtime.ycp 2012-02-23 10:14:39.000000000 +0100 @@ -32,6 +32,7 @@ ], "target" : $[ "size" : 1, + "stat" : $[ "dummy": true ] ], ]; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-dns-server for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2012-02-29 14:12:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-dns-server", Maintainer is "locilka(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2011-11-16 17:23:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2012-02-29 14:12:46.000000000 +0100 @@ -0,0 +1,23 @@ +------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). +- 2.22.1 + +------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). + +------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + Old: ---- yast2-dns-server-2.22.0.tar.bz2 New: ---- yast2-dns-server-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.v06vOl/_old 2012-02-29 14:12:50.000000000 +0100 +++ /var/tmp/diff_new_pack.v06vOl/_new 2012-02-29 14:12:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-dns-server # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: yast2-dns-server -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,7 +71,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-dns-server-2.22.0.tar.bz2 -> yast2-dns-server-2.22.1.tar.bz2 ++++++ ++++ 3196 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/yast2-dns-server-2.22.0/VERSION new/yast2-dns-server-2.22.1/VERSION --- old/yast2-dns-server-2.22.0/VERSION 2011-11-16 11:55:21.000000000 +0100 +++ new/yast2-dns-server-2.22.1/VERSION 2012-02-28 13:18:10.000000000 +0100 @@ -1 +1 @@ -2.22.0 +2.22.1 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/yast2-dns-server-2.22.0/configure.in new/yast2-dns-server-2.22.1/configure.in --- old/yast2-dns-server-2.22.0/configure.in 2011-11-16 11:54:34.000000000 +0100 +++ new/yast2-dns-server-2.22.1/configure.in 2012-02-28 13:19:36.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-dns-server dnl -dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dns-server, 2.21.3, http://bugs.opensuse.org/, yast2-dns-server) +AC_INIT(yast2-dns-server, 2.22.1, http://bugs.opensuse.org/, yast2-dns-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.3" +VERSION="2.22.1" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" 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/yast2-dns-server-2.22.0/src/DnsServer.pm new/yast2-dns-server-2.22.1/src/DnsServer.pm --- old/yast2-dns-server-2.22.0/src/DnsServer.pm 2011-11-16 11:54:54.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/DnsServer.pm 2012-02-20 11:02:10.000000000 +0100 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1266,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1674,7 +1692,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; @@ -1774,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1789,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1840,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1870,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1896,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1931,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } 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/yast2-dns-server-2.22.0/src/DnsServerHelperFunctions.ycp new/yast2-dns-server-2.22.1/src/DnsServerHelperFunctions.ycp --- old/yast2-dns-server-2.22.0/src/DnsServerHelperFunctions.ycp 2009-12-18 14:50:37.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/DnsServerHelperFunctions.ycp 2012-02-20 11:02:10.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Module containing helper functions. * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: DnsServerHelperFunctions.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: DnsServerHelperFunctions.ycp 67408 2012-02-10 12:27:51Z locilka $ * * Module handles dynamic update of zone using 'nsupdate' command. * Automatic generation of connected zones and much more! @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } 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/yast2-dns-server-2.22.0/src/cmdline.ycp new/yast2-dns-server-2.22.1/src/cmdline.ycp --- old/yast2-dns-server-2.22.0/src/cmdline.ycp 2011-11-16 11:54:54.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/cmdline.ycp 2011-11-25 10:38:38.000000000 +0100 @@ -6,7 +6,7 @@ * Summary: Command Line for YaST2 DNS Server * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: cmdline.ycp 33316 2006-10-10 13:17:16Z locilka $ + * $Id: cmdline.ycp 66820 2011-11-16 10:56:18Z jsuchome $ */ { 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/yast2-dns-server-2.22.0/src/dialog-installwizard.ycp new/yast2-dns-server-2.22.1/src/dialog-installwizard.ycp --- old/yast2-dns-server-2.22.0/src/dialog-installwizard.ycp 2011-11-16 11:54:54.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/dialog-installwizard.ycp 2011-11-25 10:38:38.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dialog-installwizard.ycp 54960 2009-01-23 17:40:03Z locilka $ + * $Id: dialog-installwizard.ycp 66820 2011-11-16 10:56:18Z jsuchome $ */ { 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/yast2-dns-server-2.22.0/src/dialog-main.ycp new/yast2-dns-server-2.22.1/src/dialog-main.ycp --- old/yast2-dns-server-2.22.0/src/dialog-main.ycp 2011-11-16 11:54:54.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/dialog-main.ycp 2011-11-25 10:38:38.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dialog-main.ycp 64493 2011-06-21 07:33:30Z locilka $ + * $Id: dialog-main.ycp 66820 2011-11-16 10:56:18Z jsuchome $ */ { 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/yast2-dns-server-2.22.0/src/dialog-masterzone.ycp new/yast2-dns-server-2.22.1/src/dialog-masterzone.ycp --- old/yast2-dns-server-2.22.0/src/dialog-masterzone.ycp 2011-11-16 11:54:54.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/dialog-masterzone.ycp 2012-02-20 11:02:10.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jiri.srain(a)suse.cz>, * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dialog-masterzone.ycp 64704 2011-07-01 12:54:54Z locilka $ + * $Id: dialog-masterzone.ycp 67408 2012-02-10 12:27:51Z locilka $ */ { @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); @@ -1561,6 +1553,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1601,11 +1608,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } 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/yast2-dns-server-2.22.0/src/helps.ycp new/yast2-dns-server-2.22.1/src/helps.ycp --- old/yast2-dns-server-2.22.0/src/helps.ycp 2011-11-16 11:54:54.000000000 +0100 +++ new/yast2-dns-server-2.22.1/src/helps.ycp 2011-11-25 10:38:38.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jiri.srain(a)suse.cz>, * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: helps.ycp 64704 2011-07-01 12:54:54Z locilka $ + * $Id: helps.ycp 66820 2011-11-16 10:56:18Z jsuchome $ */ { 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/yast2-dns-server-2.22.0/testsuite/tests/DnsServerHelperFunctions.out new/yast2-dns-server-2.22.1/testsuite/tests/DnsServerHelperFunctions.out --- old/yast2-dns-server-2.22.0/testsuite/tests/DnsServerHelperFunctions.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-dns-server-2.22.1/testsuite/tests/DnsServerHelperFunctions.out 2012-02-20 11:02:10.000000000 +0100 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== 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/yast2-dns-server-2.22.0/testsuite/tests/DnsServerHelperFunctions.ycp new/yast2-dns-server-2.22.1/testsuite/tests/DnsServerHelperFunctions.ycp --- old/yast2-dns-server-2.22.0/testsuite/tests/DnsServerHelperFunctions.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-dns-server-2.22.1/testsuite/tests/DnsServerHelperFunctions.ycp 2012-02-20 11:02:10.000000000 +0100 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xmms2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package xmms2 for openSUSE:Factory checked in at 2012-02-29 14:12:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmms2 (Old) and /work/SRC/openSUSE:Factory/.xmms2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xmms2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xmms2/xmms2.changes 2011-10-28 15:30:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2.changes 2012-02-29 14:12:31.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 9 08:44:05 UTC 2011 - coolo(a)suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmms2.spec ++++++ --- /var/tmp/diff_new_pack.WhUhjo/_old 2012-02-29 14:12:33.000000000 +0100 +++ /var/tmp/diff_new_pack.WhUhjo/_new 2012-02-29 14:12:33.000000000 +0100 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %bcond_with libsidplay %bcond_with restricted %bcond_with cunit @@ -35,11 +33,11 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause +Group: Productivity/Multimedia/Sound/Players Version: 0.7 -Release: 13 +Release: 0 # TODO: Make sure to update the verison number in xmms2-pkgconfig.patch. -License: LGPLv2+ and GPLv2+ and BSD -Group: Productivity/Multimedia/Sound/Players Source0: %{name}-%{version}%{codename}.tar.bz2 Source1: xmms2-client-launcher.sh Source2: README.SuSE @@ -69,15 +67,47 @@ Url: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %name-plugin-base -BuildRequires: flac-devel libofa-devel libvorbis-devel speex-devel sqlite-devel -BuildRequires: libcdio-devel libdiscid-devel libsmbclient-devel wavpack-devel -BuildRequires: gnome-vfs2-devel jack-audio-connection-kit-devel libmpcdec-devel -BuildRequires: alsa-lib-devel fftw3-devel libsamplerate-devel libxml2-devel -BuildRequires: libao-devel libcurl-devel libshout-devel pyrex ruby ruby-devel -BuildRequires: boost-devel libavahi-glib-devel libpulse-devel perl python-devel -BuildRequires: avahi-compat-mDNSResponder-devel doxygen libmodplug-devel -BuildRequires: autoconf automake fdupes gcc gcc-c++ libogg-devel libopenssl-devel make -BuildRequires: SDL-devel libvisual-devel readline-devel +BuildRequires: SDL-devel +BuildRequires: alsa-lib-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: avahi-compat-mDNSResponder-devel +BuildRequires: boost-devel +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: fftw3-devel +BuildRequires: flac-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: gnome-vfs2-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libao-devel +BuildRequires: libavahi-glib-devel +BuildRequires: libcdio-devel +BuildRequires: libcurl-devel +BuildRequires: libdiscid-devel +BuildRequires: libmodplug-devel +BuildRequires: libmpcdec-devel +BuildRequires: libofa-devel +BuildRequires: libogg-devel +BuildRequires: libopenssl-devel +BuildRequires: libpulse-devel +BuildRequires: libsamplerate-devel +BuildRequires: libshout-devel +BuildRequires: libsmbclient-devel +BuildRequires: libvisual-devel +BuildRequires: libvorbis-devel +BuildRequires: libxml2-devel +BuildRequires: make +BuildRequires: perl +BuildRequires: pyrex +BuildRequires: python-devel +BuildRequires: readline-devel +BuildRequires: ruby +BuildRequires: ruby-devel +BuildRequires: speex-devel +BuildRequires: sqlite-devel +BuildRequires: wavpack-devel %ifarch %ix86 x86_64 ppc ppc64 BuildRequires: valgrind-devel %endif @@ -101,7 +131,9 @@ %endif %if %{with restricted} -BuildRequires: libfaad-devel libmms-devel libmpg123-devel +BuildRequires: libfaad-devel +BuildRequires: libmms-devel +BuildRequires: libmpg123-devel %endif %description @@ -117,40 +149,40 @@ %package -n libxmmsclient++-glib1 -License: LGPLv2+ and GPLv2+ and BSD Summary: Glib c++ client library for %{name} +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Sound/Players %description -n libxmmsclient++-glib1 A simple glib c++ client library for XMMS2 %package -n libxmmsclient++4 -License: LGPLv2+ and GPLv2+ and BSD Summary: C++ client library for %{name} +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Sound/Players %description -n libxmmsclient++4 A simple C++ client library for XMMS2 %package -n libxmmsclient-glib1 -License: LGPLv2+ and GPLv2+ and BSD Summary: Glib client library for %{name} +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Sound/Players %description -n libxmmsclient-glib1 A simple Glib client library for XMMS2 %package -n libxmmsclient6 -License: LGPLv2+ and GPLv2+ and BSD Summary: Client library for %{name} +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Sound/Players %description -n libxmmsclient6 A simple client library for XMMS2 %package devel -License: LGPLv2+ and GPLv2+ and BSD Summary: Development libraries and headers for XMMS2 +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: Development/Libraries/C and C++ Requires: glib2-devel Requires: boost-devel @@ -166,8 +198,8 @@ or build new plugins for XMMS2. %package docs -License: LGPLv2+ and GPLv2+ and BSD Summary: Development documentation for XMMS2 +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: Documentation/Other Requires: %{name} = %{version} @@ -175,8 +207,8 @@ API documentation for the XMMS2 modular audio framework architecture. %package -n python-xmms2 -License: LGPLv2+ and GPLv2+ and BSD Summary: Python support for XMMS2 +License: LGPL-2.1+ and GPL-2.0+ and BSD-3-Clause Group: System/Libraries Requires: %{name} = %{version} Requires: python @@ -186,7 +218,7 @@ %package perl Summary: Perl support for XMMS2 -License: GPL+ or Artistic +License: GPL-1.0+ or Artistic-1.0 Group: System/Libraries Requires: %{name} = %{version} Requires: perl-base @@ -195,8 +227,8 @@ Perl bindings for XMMS2. %package ruby -License: GPL+ or Artistic Summary: Ruby support for XMMS2 +License: GPL-1.0+ or Artistic-1.0 Group: System/Libraries Requires: %{name} = %{version} Requires: ruby >= 1.8 @@ -206,8 +238,8 @@ %package plugin-base -License: GPL+ or Artistic Summary: Base plugins for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -223,8 +255,8 @@ client (such as gxmms2 or esperanza). %package plugin-airplay -License: GPL+ or Artistic Summary: Airplay Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -240,8 +272,8 @@ client (such as gxmms2 or esperanza). %package plugin-ao -License: GPL+ or Artistic Summary: Ao Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -257,8 +289,8 @@ client (such as gxmms2 or esperanza). %package plugin-apefile -License: GPL+ or Artistic Summary: Apefile Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -274,8 +306,8 @@ client (such as gxmms2 or esperanza). %package plugin-asf -License: GPL+ or Artistic Summary: Asf Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -291,8 +323,8 @@ client (such as gxmms2 or esperanza). %package plugin-asx -License: GPL+ or Artistic Summary: Asx Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -308,8 +340,8 @@ client (such as gxmms2 or esperanza). %package plugin-cdda -License: GPL+ or Artistic Summary: Cdda Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -325,8 +357,8 @@ client (such as gxmms2 or esperanza). %package plugin-cue -License: GPL+ or Artistic Summary: Cue Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -342,8 +374,8 @@ client (such as gxmms2 or esperanza). %package plugin-curl -License: GPL+ or Artistic Summary: Curl Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -359,8 +391,8 @@ client (such as gxmms2 or esperanza). %package plugin-daap -License: GPL+ or Artistic Summary: Daap Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -376,8 +408,8 @@ client (such as gxmms2 or esperanza). %package plugin-flac -License: GPL+ or Artistic Summary: Flac Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -393,8 +425,8 @@ client (such as gxmms2 or esperanza). %package plugin-flv -License: GPL+ or Artistic Summary: Flv Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -410,8 +442,8 @@ client (such as gxmms2 or esperanza). %package plugin-gvfs -License: GPL+ or Artistic Summary: Gvfs Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -430,8 +462,8 @@ %if %{with gme} %package plugin-gme -License: GPL+ or Artistic Summary: Gme Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -449,8 +481,8 @@ %endif %package plugin-html -License: GPL+ or Artistic Summary: Html Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -466,8 +498,8 @@ client (such as gxmms2 or esperanza). %package plugin-ices -License: GPL+ or Artistic Summary: Ices Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -483,8 +515,8 @@ client (such as gxmms2 or esperanza). %package plugin-icymetaint -License: GPL+ or Artistic Summary: SDL Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -500,8 +532,8 @@ client (such as gxmms2 or esperanza). %package plugin-id3v2 -License: GPL+ or Artistic Summary: Id3v2 Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -517,8 +549,8 @@ client (such as gxmms2 or esperanza). %package plugin-jack -License: GPL+ or Artistic Summary: Jack Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -534,8 +566,8 @@ client (such as gxmms2 or esperanza). %package plugin-karaoke -License: GPL+ or Artistic Summary: Karaoke Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -551,8 +583,8 @@ client (such as gxmms2 or esperanza). %package plugin-m3u -License: GPL+ or Artistic Summary: M3u Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -568,8 +600,8 @@ client (such as gxmms2 or esperanza). %package plugin-modplug -License: GPL+ or Artistic Summary: Modplug Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -585,8 +617,8 @@ client (such as gxmms2 or esperanza). %package plugin-mp4 -License: GPL+ or Artistic Summary: Mp4 Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -602,8 +634,8 @@ client (such as gxmms2 or esperanza). %package plugin-musepack -License: GPL+ or Artistic Summary: Musepack Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -619,8 +651,8 @@ client (such as gxmms2 or esperanza). %package plugin-normalize -License: GPL+ or Artistic Summary: Normalize Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -636,8 +668,8 @@ client (such as gxmms2 or esperanza). %package plugin-ofa -License: GPL+ or Artistic Summary: Ofa Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -653,8 +685,8 @@ client (such as gxmms2 or esperanza). %package plugin-pulse -License: GPL+ or Artistic Summary: Pulse Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -670,8 +702,8 @@ client (such as gxmms2 or esperanza). %package plugin-samba -License: GPL+ or Artistic Summary: Samba Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -687,8 +719,8 @@ client (such as gxmms2 or esperanza). %package plugin-speex -License: GPL+ or Artistic Summary: Speex Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -704,8 +736,8 @@ client (such as gxmms2 or esperanza). %package plugin-tta -License: GPL+ or Artistic Summary: Tta Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -721,8 +753,8 @@ client (such as gxmms2 or esperanza). %package plugin-vocoder -License: GPL+ or Artistic Summary: Vocoder Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -738,8 +770,8 @@ client (such as gxmms2 or esperanza). %package plugin-wave -License: GPL+ or Artistic Summary: Wave Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -755,8 +787,8 @@ client (such as gxmms2 or esperanza). %package plugin-wavpack -License: GPL+ or Artistic Summary: Wavpack Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} @@ -774,8 +806,8 @@ %if %{with restricted} %package plugin-restricted -License: GPL+ or Artistic Summary: Restricted plugins Support for %{name} +License: GPL-1.0+ or Artistic-1.0 Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vino for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package vino for openSUSE:Factory checked in at 2012-02-29 14:12:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vino (Old) and /work/SRC/openSUSE:Factory/.vino.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vino", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vino/vino.changes 2012-02-21 12:26:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vino.new/vino.changes 2012-02-29 14:12:27.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Feb 28 15:42:24 CET 2012 - fcrozat(a)suse.com + +- Add missing pkgconfig(xtst) BuildRequires: it used to be + automatically brought in before the xorg-x11 packaging changes. +- Add libjpeg-devel / libgcrypt-devel BuildRequires: those were + missing, which meant we didn't have some important features. +- Add explicit switches to configure to ensure features are not + lost by accident: --enable-ipv6 --with-telepathy --with-libnotify + --with-network-manager --with-gnome-keyring --with-gnutls + --with-gcrypt --with-avahi --with-zlib --with-jpeg. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.1KqgoM/_old 2012-02-29 14:12:28.000000000 +0100 +++ /var/tmp/diff_new_pack.1KqgoM/_new 2012-02-29 14:12:28.000000000 +0100 @@ -29,7 +29,9 @@ BuildRequires: gnutls-devel BuildRequires: intltool BuildRequires: libavahi-glib-devel +BuildRequires: libgcrypt-devel BuildRequires: libgnome-keyring-devel +BuildRequires: libjpeg-devel BuildRequires: libnotify-devel BuildRequires: libsoup-devel BuildRequires: telepathy-glib-devel @@ -38,6 +40,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xtst) Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -53,6 +56,16 @@ %build %configure\ --libexecdir=%{_libexecdir}/vino \ + --enable-ipv6 \ + --with-telepathy \ + --with-libnotify \ + --with-network-manager \ + --with-gnome-keyring \ + --with-gnutls \ + --with-gcrypt \ + --with-avahi \ + --with-zlib \ + --with-jpeg \ --enable-http-server=yes %__make %{?jobs:-j%jobs} V=1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vinagre for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at 2012-02-29 14:12:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vinagre (Old) and /work/SRC/openSUSE:Factory/.vinagre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vinagre", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vinagre/vinagre.changes 2012-01-25 10:41:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vinagre.new/vinagre.changes 2012-02-29 14:12:24.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 28 14:07:08 UTC 2012 - fcrozat(a)suse.com + +- Enable spice support: + - add pkgconfig(spice-client-gtk-3.0) BuildRequires + - pass --enable-spice to configure instead of --disable-spice + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.z4cxVX/_old 2012-02-29 14:12:26.000000000 +0100 +++ /var/tmp/diff_new_pack.z4cxVX/_new 2012-02-29 14:12:26.000000000 +0100 @@ -44,6 +44,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk-vnc-2.0) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.5 BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(vte-2.90) Requires: gnome-icon-theme @@ -68,7 +69,7 @@ %configure --disable-static \ --disable-scrollkeeper \ --enable-ssh \ - --disable-spice + --enable-spice make V=1 %{?_smp_mflags} %install -- 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 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package tvbrowser for openSUSE:Factory checked in at 2012-02-29 14:12:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tvbrowser (Old) and /work/SRC/openSUSE:Factory/.tvbrowser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tvbrowser", Maintainer is "TPatzig(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tvbrowser/tvbrowser.changes 2011-09-23 12:49:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tvbrowser.new/tvbrowser.changes 2012-02-29 14:12:22.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Dec 5 15:42:48 UTC 2011 - gber(a)opensuse.org + +- convert the included license to Unix line endings instead of + shipping a separate copy of the license +- create a tailored launch script instead of relying on the + guesswork in the upstream script and do not create symlinks + bypassing the packaging system in %post +- create desktop file via %suse_update_desktop_file instead of + patching the upstream one +- create explicit symlinks for application icons +- use %desktop_database_post/un and %icon_theme_cache_post/un to + have the menu and icon caches updated on GTK-based desktops +- correct the RPM group + +------------------------------------------------------------------- +Sun Oct 30 12:55:37 UTC 2011 - dl8fcl(a)darc.de + +- Update to version 3.1 + +------------------------------------------------------------------- Old: ---- LICENSE.txt tvbrowser-3.0.2.tar.bz2 tvbrowser-desktop.patch New: ---- tvbrowser-3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tvbrowser.spec ++++++ --- /var/tmp/diff_new_pack.MIQovP/_old 2012-02-29 14:12:24.000000000 +0100 +++ /var/tmp/diff_new_pack.MIQovP/_new 2012-02-29 14:12:24.000000000 +0100 @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: tvbrowser -BuildRequires: dos2unix fdupes optipng update-desktop-files Summary: Digital TV guide -Version: 3.0.2 -Release: 1 -License: GPLv3 -Group: Productivity/Networking/News/Utilities +License: GPL-3.0+ +Group: Productivity/Multimedia/Other +Version: 3.1 +Release: 0 Requires: java >= 1.6 Url: http://tv-browser.org Source0: %{name}-%{version}.tar.bz2 -Source1: LICENSE.txt -Patch0: tvbrowser-desktop.patch +BuildRequires: dos2unix +BuildRequires: optipng +BuildRequires: update-desktop-files +# needed for expanding %%icon_theme_cache_post in %%post/un +BuildRequires: gtk3-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -37,64 +37,59 @@ Reminders, Program info and Search are also contained in TV-Browser package. Additional Plugins can be installed with the download function of TV-Browser. -Authors: --------- - Bodo Tasche - Martin Oberhauser - René Mach - Björn Balazs - Nelson Darkwah Oppong - Joakim Arborelius - Til Schneider - Michael Keppler - Klaus Blessing %prep %setup -q -%patch0 -p 1 -rm LICENSE.txt -cp -f %{S:1} ./ +dos2unix LICENSE.txt +find -name "*.png" | while read a; do + optipng -o 5 "$a" || optipng -o 5 -fix "$a" +done %build +cat >tvbrowser <<'EOF' +#!/bin/sh + +cd %{_datadir}/%{name} && \ + exec %{_bindir}/java \ + -Xms16m \ + -Xmx128m \ + -Djava.library.path=%{_datadir}/%{name} \ + -Dpropertiesfile=linux.properties \ + -jar tvbrowser.jar \ + "$@" +EOF %install export NO_BRP_CHECK_BYTECODE_VERSION="true" -rm -f *.url -find -name "*.png" | while read a -do - optipng -o 5 "$a" || optipng -o 5 -fix "$a" +install -D -p -m 755 tvbrowser %{buildroot}%{_bindir}/tvbrowser +for file in linux.properties tvbrowser.jar; do + install -D -p -m 644 ${file} %{buildroot}%{_datadir}/%{name}/${file} done -install -d %buildroot%_datadir/%name -install -d %buildroot/usr/bin -cp -a * %buildroot%_datadir/%name/ -mkdir -p %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/%{name}/*.txt %{buildroot}%{_docdir}/%{name}/ -install -d %buildroot/usr/share/icons/hicolor/128x128/apps -install -d %buildroot/usr/share/icons/hicolor/48x48/apps -install -d %buildroot/usr/share/icons/hicolor/32x32/apps -install -d %buildroot/usr/share/icons/hicolor/16x16/apps -cp -p imgs/tvbrowser128.png %buildroot/usr/share/icons/hicolor/128x128/apps/tvbrowser.png -cp -p imgs/tvbrowser48.png %buildroot/usr/share/icons/hicolor/48x48/apps/tvbrowser.png -cp -p imgs/tvbrowser32.png %buildroot/usr/share/icons/hicolor/32x32/apps/tvbrowser.png -cp -p imgs/tvbrowser16.png %buildroot/usr/share/icons/hicolor/16x16/apps/tvbrowser.png -install -d %buildroot/usr/share/applications -install -p tvbrowser.desktop %buildroot/usr/share/applications/tvbrowser.desktop -rm %{buildroot}%{_datadir}/%{name}/tvbrowser.desktop *.txt -%fdupes -s %{buildroot}%{_datadir} -%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/tvbrowser.desktop +find hyphen icons imgs personas plugins themepacks -depth -print | \ + cpio -p -d -m %{buildroot}%{_datadir}/%{name} +for size in 16 32 48 128; do + ( + install -d %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/ + cd %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/ + ln -s ../../../../tvbrowser/imgs/tvbrowser${size}.png tvbrowser.png + ) +done +%suse_update_desktop_file -c tvbrowser TV-Browser 'Digital TV Guide' tvbrowser tvbrowser AudioVideo TV Java + +%post +%desktop_database_post +%icon_theme_cache_post -%clean -rm -rf $RPM_BUILD_ROOT +%postun +%desktop_database_postun +%icon_theme_cache_postun %files %defattr(-,root,root,-) -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/* -%_datadir/%name +%doc COPYRIGHT.txt LICENSE.txt +%{_bindir}/tvbrowser +%{_datadir}/%{name} %{_datadir}/applications/tvbrowser.desktop -%{_datadir}/icons/hicolor - -%post -ln -s -f %_datadir/%name/tvbrowser.sh /usr/bin/tvbrowser +%{_datadir}/icons/hicolor/*/apps/tvbrowser.png %changelog ++++++ tvbrowser-3.0.2.tar.bz2 -> tvbrowser-3.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/tvbrowser/tvbrowser-3.0.2.tar.bz2 /work/SRC/openSUSE:Factory/.tvbrowser.new/tvbrowser-3.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit transmission for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package transmission for openSUSE:Factory checked in at 2012-02-29 14:12:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/transmission (Old) and /work/SRC/openSUSE:Factory/.transmission.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "transmission", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/transmission/transmission.changes 2012-02-21 12:26:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.transmission.new/transmission.changes 2012-02-29 14:12:08.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 27 20:31:47 UTC 2012 - dimstar(a)opensuse.org + +- Conditionally use libminiupnpc-devel BuildRequires on openSUSE + 12.2 and later only. Previous openSUSE versions did not have the + package and will make use of the miniupnp that is bundled with + the transmission sources. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transmission.spec ++++++ --- /var/tmp/diff_new_pack.pdlmbd/_old 2012-02-29 14:12:09.000000000 +0100 +++ /var/tmp/diff_new_pack.pdlmbd/_new 2012-02-29 14:12:09.000000000 +0100 @@ -31,7 +31,9 @@ %endif BuildRequires: libcurl-devel BuildRequires: libevent-devel >= 2.0.0 +%if 0%{?suse_version} > 1210 BuildRequires: libminiupnpc-devel +%endif BuildRequires: libqt4-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit stardict-sounds-wyabdcrealpeopletts for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package stardict-sounds-wyabdcrealpeopletts for openSUSE:Factory checked in at 2012-02-29 14:11:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict-sounds-wyabdcrealpeopletts (Old) and /work/SRC/openSUSE:Factory/.stardict-sounds-wyabdcrealpeopletts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stardict-sounds-wyabdcrealpeopletts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict-sounds-wyabdcrealpeopletts/stardict-sounds-wyabdcrealpeopletts.changes 2011-09-23 12:46:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stardict-sounds-wyabdcrealpeopletts.new/stardict-sounds-wyabdcrealpeopletts.changes 2012-02-29 14:11:57.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 13 10:56:36 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict-sounds-wyabdcrealpeopletts.spec ++++++ --- /var/tmp/diff_new_pack.W7K5S8/_old 2012-02-29 14:11:59.000000000 +0100 +++ /var/tmp/diff_new_pack.W7K5S8/_new 2012-02-29 14:11:59.000000000 +0100 @@ -22,7 +22,7 @@ Summary: Wyabdc RealPeople TTS audio collection of english words Version: 2.1.0 Release: 1 -License: GPLv2+ +License: GPL-2.0+ Group: Productivity/Office/Dictionary Url: http://stardict.sourceforge.net Provides: locale(stardict:en) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0