openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2009
- 1 participants
- 480 discussions
Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Wed Nov 25 14:35:07 CET 2009.
--------
--- yast2-installation/yast2-installation.changes 2009-10-23 07:52:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2009-11-24 16:30:22.000000000 +0100
@@ -1,0 +2,22 @@
+Tue Nov 24 16:13:31 CET 2009 - kmachalkova(a)suse.cz
+
+Cumulative patch with SLE11 SP1 features:
+- In TUI (ncurses), use plain text (.txt) file with release notes,
+ if found (FaTE#306167)
+- Set /etc/sysconfig/boot:RUN_PARALLEL according to corresponding
+ value in control file (FaTE#307555)
+- 2.19.0
+
+-------------------------------------------------------------------
+Thu Nov 19 16:51:55 CET 2009 - locilka(a)suse.cz
+
+- Added control file configuration option require_registration
+ (FATE #305578).
+
+-------------------------------------------------------------------
+Wed Nov 4 16:31:17 CET 2009 - mzugec(a)suse.cz
+
+- lan module in 1st stage (FaTE#303069)
+- 2.18.34
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.18.33.tar.bz2
New:
----
yast2-installation-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.YQRIwW/_old 2009-11-25 14:27:48.000000000 +0100
+++ /var/tmp/diff_new_pack.YQRIwW/_new 2009-11-25 14:27:48.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.33)
+# spec file for package yast2-installation (Version 2.19.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-installation
-Version: 2.18.33
+Version: 2.19.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.33.tar.bz2
+Source0: yast2-installation-2.19.0.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -103,7 +103,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.18.33
+%setup -n yast2-installation-2.19.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -150,6 +150,7 @@
/usr/share/YaST2/include/installation/*
# agents
/usr/share/YaST2/scrconf/etc_passwd.scr
+/usr/share/YaST2/scrconf/cfg_boot.scr
/usr/share/YaST2/scrconf/cfg_windowmanager.scr
/usr/share/YaST2/scrconf/cfg_fam.scr
/usr/share/YaST2/scrconf/etc_install_inf.scr
++++++ yast2-installation-2.18.33.tar.bz2 -> yast2-installation-2.19.0.tar.bz2 ++++++
++++ 19753 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-installation-2.18.33/agents/cfg_boot.scr new/yast2-installation-2.19.0/agents/cfg_boot.scr
--- old/yast2-installation-2.18.33/agents/cfg_boot.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.19.0/agents/cfg_boot.scr 2009-11-24 16:27:47.000000000 +0100
@@ -0,0 +1,15 @@
+/**
+ * File:
+ * cfg_boot.scr
+ * Summary:
+ * SCR Agent for reading/writing /etc/sysconfig/boot
+ * using the sysconfig-agent
+ *
+ * Read/Sets the values defined in <tt>/etc/sysconfig/boot</tt>
+ * in an easy manner.
+ */
+.sysconfig.boot
+
+`ag_ini(
+ `SysConfigFile("/etc/sysconfig/boot")
+)
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-installation-2.18.33/configure.in new/yast2-installation-2.19.0/configure.in
--- old/yast2-installation-2.18.33/configure.in 2009-10-23 07:42:32.000000000 +0200
+++ new/yast2-installation-2.19.0/configure.in 2009-09-04 18:35:02.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.33, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.18.23, http://bugs.opensuse.org/, yast2-installation)
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.18.33"
+VERSION="2.18.23"
RPMNAME="yast2-installation"
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-installation-2.18.33/control/control.openSUSE.xml new/yast2-installation-2.19.0/control/control.openSUSE.xml
--- old/yast2-installation-2.18.33/control/control.openSUSE.xml 2009-10-01 11:12:44.000000000 +0200
+++ new/yast2-installation-2.19.0/control/control.openSUSE.xml 2009-11-24 17:07:58.000000000 +0100
@@ -17,6 +17,8 @@
<!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS -->
<write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts>
+ <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL -->
+ <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel>
<incomplete_translation_treshold>95</incomplete_translation_treshold>
<inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution>
@@ -203,7 +205,7 @@
<prod_dir>/</prod_dir>
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">true</autorefresh>
- <priority config:type="integer">100</priority>
+ <priority config:type="integer">99</priority>
</extra_url>
<!-- Replacement for EXTRAURLS and OPTIONALURLS -->
@@ -620,6 +622,10 @@
<retranslate config:type="boolean">true</retranslate>
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
</module>
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-installation-2.18.33/control/control.rnc new/yast2-installation-2.19.0/control/control.rnc
--- old/yast2-installation-2.18.33/control/control.rnc 2009-09-09 08:41:00.000000000 +0200
+++ new/yast2-installation-2.19.0/control/control.rnc 2009-11-24 16:27:47.000000000 +0100
@@ -46,6 +46,7 @@
| firewall_enable_ssh
| firewall_enable_ssh
| write_hostname_to_hosts
+ | run_init_scripts_in_parallel
| inform_about_suboptimal_distribution
| skip_language_dialog
| enable_clone
@@ -82,6 +83,7 @@
| enable_autologin
| runlevel
| debug_deploying
+ | require_registration
additional_kernel_parameters = element additional_kernel_parameters { text }
incomplete_translation_treshold = element incomplete_translation_treshold { text }
@@ -99,6 +101,7 @@
enable_firewall = element enable_firewall { BOOLEAN }
firewall_enable_ssh = element firewall_enable_ssh { BOOLEAN }
write_hostname_to_hosts = element write_hostname_to_hosts { BOOLEAN }
+run_init_scripts_in_parallel = element run_init_scripts_in_parallel { BOOLEAN }
inform_about_suboptimal_distribution = element inform_about_suboptimal_distribution { BOOLEAN }
skip_language_dialog = element skip_language_dialog { BOOLEAN }
enable_clone = element enable_clone { BOOLEAN }
@@ -121,6 +124,7 @@
default_ntp_setup = element default_ntp_setup { BOOLEAN }
enable_kdump = element enable_kdump { BOOLEAN }
debug_deploying = element debug_deploying { BOOLEAN }
+require_registration = element require_registration { BOOLEAN }
save_instsys_content = element save_instsys_content {
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-installation-2.18.33/control/control.rng new/yast2-installation-2.19.0/control/control.rng
--- old/yast2-installation-2.18.33/control/control.rng 2009-07-30 15:46:52.000000000 +0200
+++ new/yast2-installation-2.19.0/control/control.rng 2009-11-24 17:08:02.000000000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns:config="http://www.suse.com/1.0/configns" ns="http://www.suse.com/1.0/yast2ns" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- types -->
<define name="BOOLEAN">
<attribute name="config:type">
@@ -54,6 +54,7 @@
<ref name="firewall_enable_ssh"/>
<ref name="firewall_enable_ssh"/>
<ref name="write_hostname_to_hosts"/>
+ <ref name="run_init_scripts_in_parallel"/>
<ref name="inform_about_suboptimal_distribution"/>
<ref name="skip_language_dialog"/>
<ref name="enable_clone"/>
@@ -90,6 +91,7 @@
<ref name="enable_autologin"/>
<ref name="runlevel"/>
<ref name="debug_deploying"/>
+ <ref name="require_registration"/>
</choice>
</define>
<define name="additional_kernel_parameters">
@@ -167,6 +169,11 @@
<ref name="BOOLEAN"/>
</element>
</define>
+ <define name="run_init_scripts_in_parallel">
+ <element name="run_init_scripts_in_parallel">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
<define name="inform_about_suboptimal_distribution">
<element name="inform_about_suboptimal_distribution">
<ref name="BOOLEAN"/>
@@ -277,6 +284,11 @@
<ref name="BOOLEAN"/>
</element>
</define>
+ <define name="require_registration">
+ <element name="require_registration">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
<define name="save_instsys_content">
<element name="save_instsys_content">
<ref name="LIST"/>
@@ -354,6 +366,9 @@
<oneOrMore>
<element name="ac_step">
<interleave>
+ <element name="unique_id">
+ <text/>
+ </element>
<optional>
<element name="text_id">
<text/>
@@ -963,6 +978,9 @@
<text/>
</element>
</optional>
+ <element name="unique_id">
+ <text/>
+ </element>
<optional>
<element name="enable_skip">
<choice>
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-installation-2.18.33/control/control.SLED.xml new/yast2-installation-2.19.0/control/control.SLED.xml
--- old/yast2-installation-2.18.33/control/control.SLED.xml 2009-09-09 08:41:00.000000000 +0200
+++ new/yast2-installation-2.19.0/control/control.SLED.xml 2009-11-24 17:06:34.000000000 +0100
@@ -17,6 +17,8 @@
<!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS -->
<write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts>
+ <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL -->
+ <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel>
<incomplete_translation_treshold>95</incomplete_translation_treshold>
<inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution>
@@ -430,7 +432,22 @@
</proposal_tab>
</proposal_tabs>
</proposal>
-
+ <proposal>
+ <label>Live Installation Settings</label>
+ <mode>live_installation</mode>
+ <stage>initial</stage>
+ <name>initial</name>
+ <unique_id>live_inst_initial</unique_id>
+ <enable_skip>no</enable_skip>
+ <proposal_modules config:type="list">
+ <proposal_module>hwinfo</proposal_module>
+ <proposal_module>partitions</proposal_module>
+ <proposal_module>bootloader</proposal_module>
+ <proposal_module>keyboard</proposal_module>
+ <proposal_module>timezone</proposal_module>
+ <proposal_module>runlevel</proposal_module>
+ </proposal_modules>
+ </proposal>
<proposal>
<label>Update Settings</label>
<mode>update</mode>
@@ -549,6 +566,12 @@
<enable_next>yes</enable_next>
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
<enable_back>yes</enable_back>
@@ -670,6 +693,91 @@
</modules>
</workflow>
+ <!-- Stage: Initial, Mode: Live Installation -->
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </defaults>
+ <label>Installation</label>
+ <mode>live_installation</mode>
+ <stage>initial</stage>
+ <modules config:type="list">
+ <module>
+ <label>Welcome</label>
+ <name>complex_welcome</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
+ <module>
+ <label>Time Zone</label>
+ <name>timezone</name>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <enable_back>yes</enable_back>
+ </module>
+ <module>
+ <label>Disk</label>
+ <name>disk_proposal</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>User Settings</label>
+ <name>user_first</name>
+ </module>
+ <module>
+ <label>User Settings</label>
+ <name>root_first</name>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_live_pre-proposal</name>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_proposal</name>
+ <proposal>initial</proposal>
+ </module>
+ <!-- FATE #303860: Provide consistent progress during installation -->
+ <module>
+ <label>Perform Installation</label>
+ <name>prepareprogress</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_do_resize</name>
+ <update config:type="boolean">false</update>
+ <archs>i386,x86_64,ia64</archs>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_prepdisk</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_kickoff</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_live_doit</name>
+ <enable_next>no</enable_next>
+ <enable_back>no</enable_back>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_finish</name>
+ <enable_back>no</enable_back>
+ </module>
+ </modules>
+ </workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -1086,6 +1194,38 @@
</workflow>
<workflow>
+ <stage>continue</stage>
+ <mode>live_installation</mode>
+ <defaults>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ <archs>all</archs>
+ </defaults>
+ <modules config:type="list">
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>Automatic Configuration</label>
+ <name>automatic_configuration</name>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </module>
+ <module>
+ <name>user_non_interactive</name>
+ <!-- BNC #401319, define client to call explicitly -->
+ <execute>inst_user</execute>
+ </module>
+ <module>
+ <name>live_cleanup</name>
+ <enable_back>no</enable_back>
+ </module>
+
+ </modules>
+ </workflow>
+
+ <workflow>
<stage>initial</stage>
<label>Base Installation</label>
<mode>autoinstallation</mode>
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-installation-2.18.33/control/control.SLES.xml new/yast2-installation-2.19.0/control/control.SLES.xml
--- old/yast2-installation-2.18.33/control/control.SLES.xml 2009-09-09 08:41:00.000000000 +0200
+++ new/yast2-installation-2.19.0/control/control.SLES.xml 2009-11-24 17:07:57.000000000 +0100
@@ -17,6 +17,8 @@
<!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS -->
<write_hostname_to_hosts config:type="boolean">false</write_hostname_to_hosts>
+ <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL -->
+ <run_init_scripts_in_parallel config:type="boolean">false</run_init_scripts_in_parallel>
<incomplete_translation_treshold>95</incomplete_translation_treshold>
<inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution>
@@ -485,6 +487,24 @@
</proposal_tab>
</proposal_tabs>
</proposal>
+
+ <proposal>
+ <label>Live Installation Settings</label>
+ <mode>live_installation</mode>
+ <stage>initial</stage>
+ <name>initial</name>
+ <unique_id>live_inst_initial</unique_id>
+ <enable_skip>no</enable_skip>
+ <proposal_modules config:type="list">
+ <proposal_module>hwinfo</proposal_module>
+ <proposal_module>partitions</proposal_module>
+ <proposal_module>bootloader</proposal_module>
+ <proposal_module>keyboard</proposal_module>
+ <proposal_module>timezone</proposal_module>
+ <proposal_module>runlevel</proposal_module>
+ </proposal_modules>
+ </proposal>
+
<proposal>
<label>Update Settings</label>
<mode>update</mode>
@@ -684,6 +704,12 @@
<enable_next>yes</enable_next>
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
<enable_back>yes</enable_back>
@@ -804,6 +830,91 @@
</modules>
</workflow>
+ <!-- Stage: Initial, Mode: Live Installation -->
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </defaults>
+ <label>Installation</label>
+ <mode>live_installation</mode>
+ <stage>initial</stage>
+ <modules config:type="list">
+ <module>
+ <label>Welcome</label>
+ <name>complex_welcome</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
+ <module>
+ <label>Time Zone</label>
+ <name>timezone</name>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <enable_back>yes</enable_back>
+ </module>
+ <module>
+ <label>Disk</label>
+ <name>disk_proposal</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>User Settings</label>
+ <name>user_first</name>
+ </module>
+ <module>
+ <label>User Settings</label>
+ <name>root_first</name>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_live_pre-proposal</name>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_proposal</name>
+ <proposal>initial</proposal>
+ </module>
+ <!-- FATE #303860: Provide consistent progress during installation -->
+ <module>
+ <label>Perform Installation</label>
+ <name>prepareprogress</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_do_resize</name>
+ <update config:type="boolean">false</update>
+ <archs>i386,x86_64,ia64</archs>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_prepdisk</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_kickoff</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_live_doit</name>
+ <enable_next>no</enable_next>
+ <enable_back>no</enable_back>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>inst_finish</name>
+ <enable_back>no</enable_back>
+ </module>
+ </modules>
+ </workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -1265,6 +1376,38 @@
</workflow>
<workflow>
+ <stage>continue</stage>
+ <mode>live_installation</mode>
+ <defaults>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ <archs>all</archs>
+ </defaults>
+ <modules config:type="list">
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>Automatic Configuration</label>
+ <name>automatic_configuration</name>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </module>
+ <module>
+ <name>user_non_interactive</name>
+ <!-- BNC #401319, define client to call explicitly -->
+ <execute>inst_user</execute>
+ </module>
+ <module>
+ <name>live_cleanup</name>
+ <enable_back>no</enable_back>
+ </module>
+
+ </modules>
+ </workflow>
+
+ <workflow>
<stage>initial</stage>
<label>Base Installation</label>
<mode>autoinstallation</mode>
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-installation-2.18.33/control/control.xml new/yast2-installation-2.19.0/control/control.xml
--- old/yast2-installation-2.18.33/control/control.xml 2009-09-09 08:41:00.000000000 +0200
+++ new/yast2-installation-2.19.0/control/control.xml 2009-11-24 16:27:47.000000000 +0100
@@ -339,6 +339,12 @@
<enable_next>yes</enable_next>
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
<enable_back>yes</enable_back>
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-installation-2.18.33/control/docs/control-section.xml new/yast2-installation-2.19.0/control/docs/control-section.xml
--- old/yast2-installation-2.18.33/control/docs/control-section.xml 2008-12-19 07:49:35.000000000 +0100
+++ new/yast2-installation-2.19.0/control/docs/control-section.xml 2009-11-24 16:27:47.000000000 +0100
@@ -415,6 +415,10 @@
<listitem><para>(string) <emphasis>polkit_default_privs</emphasis> - Adjusts
<emphasis>/etc/sysconfig/security/POLKIT_DEFAULT_PRIVS</emphasis> to the defined value.
If not set or empty, sysconfig is untouched.</para></listitem>
+
+ <!-- FATE #305578: Add-On Product Requiring Registration -->
+ <listitem><para>(boolean) <emphasis>require_registration</emphasis> - Require registration
+ of add-on product (ignored in the base product).</para></listitem>
</itemizedlist>
</section>
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-installation-2.18.33/missing new/yast2-installation-2.19.0/missing
--- old/yast2-installation-2.18.33/missing 2009-10-23 07:42:36.000000000 +0200
+++ new/yast2-installation-2.19.0/missing 2009-09-04 18:35:06.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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-installation-2.18.33/src/clients/inst_release_notes.ycp new/yast2-installation-2.19.0/src/clients/inst_release_notes.ycp
--- old/yast2-installation-2.18.33/src/clients/inst_release_notes.ycp 2009-10-01 11:12:44.000000000 +0200
+++ new/yast2-installation-2.19.0/src/clients/inst_release_notes.ycp 2009-11-24 16:33:14.000000000 +0100
@@ -8,7 +8,7 @@
*
* Display release notes.
*
- * $Id: inst_release_notes.ycp 58635 2009-09-14 13:28:19Z jsrain $
+ * $Id: inst_release_notes.ycp 59741 2009-11-24 15:25:18Z kmachalkova $
*/
{
@@ -182,9 +182,10 @@
`ComboBox (`id (`lang), `opt (`notify), _("&Language"), [])
)
),
- `RichText (`id (`relnotescontent), "")
- )
- ),
+ `ReplacePoint(`id(`content_rp),
+ `RichText (`id (`relnotescontent), "")
+ )
+ )),
`HWeight( 20,`Empty() )
)
);
@@ -243,12 +244,31 @@
if (UI::WidgetExists(`productsel) && (size(relnotesproducts) < 2))
UI::ChangeWidget (`id(`productsel), `Enabled, false);
+ boolean UsePlainText ( string file ) {
+ boolean ret = UI::TextMode() && FileUtils::Exists(file);
+ if (ret)
+ y2milestone("Found .txt file with release notes, will use it for TUI.");
+ return ret;
+ }
+
void RedrawRelnotesLang (string use_file) {
- string contents = (string) SCR::Read (.target.string, use_file);
+ string text_file = regexpsub(use_file, "^(.*)\.rtf$", "\\1") + ".txt";
+ boolean plain_text = UsePlainText( text_file );
+
+ string contents = (string) SCR::Read (.target.string,
+ plain_text ? text_file : use_file );
+
if (contents == nil || contents == "") {
y2error ("Wrong relnotesfile: %1", use_file);
} else {
- UI::ChangeWidget (`id(`relnotescontent), `Value, contents);
+ if (plain_text) {
+ UI::ReplaceWidget( `id(`content_rp),
+ `RichText(`id(`relnotescontent),`opt(`plainText), contents) );
+ }
+ else {
+ UI::ReplaceWidget( `id(`content_rp),
+ `RichText(`id(`relnotescontent), contents ) );
+ }
}
}
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-installation-2.18.33/src/clients/inst_worker_continue.ycp new/yast2-installation-2.19.0/src/clients/inst_worker_continue.ycp
--- old/yast2-installation-2.18.33/src/clients/inst_worker_continue.ycp 2009-05-12 16:27:50.000000000 +0200
+++ new/yast2-installation-2.19.0/src/clients/inst_worker_continue.ycp 2009-11-24 16:27:47.000000000 +0100
@@ -14,7 +14,7 @@
* Describing and calling all submodules.
* (For continuing installation only).
*
- * $Id: inst_worker_continue.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: inst_worker_continue.ycp 59301 2009-11-04 15:32:29Z mzugec $
*/
{
textdomain "installation";
@@ -57,6 +57,8 @@
AdjustDisabledItems();
+ SetNetworkActivationModule();
+
SetDiskActivationModule();
UpdateWizardSteps ();
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-installation-2.18.33/src/clients/inst_worker_initial.ycp new/yast2-installation-2.19.0/src/clients/inst_worker_initial.ycp
--- old/yast2-installation-2.18.33/src/clients/inst_worker_initial.ycp 2009-05-12 16:27:50.000000000 +0200
+++ new/yast2-installation-2.19.0/src/clients/inst_worker_initial.ycp 2009-11-24 16:27:47.000000000 +0100
@@ -14,7 +14,7 @@
* Describing and calling all submodules.
* (For initial installation only).
*
- * $Id: inst_worker_initial.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: inst_worker_initial.ycp 59301 2009-11-04 15:32:29Z mzugec $
*/
{
textdomain "installation";
@@ -55,6 +55,8 @@
// All stages
SetUIContent();
+ SetNetworkActivationModule();
+
SetDiskActivationModule();
// Cleanup and other settings
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-installation-2.18.33/src/include/inst_inc_all.ycp new/yast2-installation-2.19.0/src/include/inst_inc_all.ycp
--- old/yast2-installation-2.18.33/src/include/inst_inc_all.ycp 2009-05-12 16:27:50.000000000 +0200
+++ new/yast2-installation-2.19.0/src/include/inst_inc_all.ycp 2009-11-24 16:27:47.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Miscelaneous functions
* Authors: Lukas Ocilka <locilka(a)suse.cz>
*
- * $Id: inst_inc_all.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: inst_inc_all.ycp 59301 2009-11-04 15:32:29Z mzugec $
*
*/
{
@@ -172,6 +172,16 @@
return;
}
+ void SetNetworkActivationModule () {
+ // update the workflow according to current situation
+ // disable lan activation if not needed
+
+ if (!(Linuxrc::InstallInf("ConfigureNetwork")=="1") ) {
+ y2milestone ("Disabling network activation module");
+ ProductControl::DisableModule ("lan");
+ }
+ }
+
void SetDiskActivationModule () {
// update the workflow according to current situation
// disable disks activation if not needed
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-installation-2.18.33/src/inst_finish/save_config_finish.ycp new/yast2-installation-2.19.0/src/inst_finish/save_config_finish.ycp
--- old/yast2-installation-2.18.33/src/inst_finish/save_config_finish.ycp 2009-10-22 15:27:06.000000000 +0200
+++ new/yast2-installation-2.19.0/src/inst_finish/save_config_finish.ycp 2009-11-24 16:27:47.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: save_config_finish.ycp 58966 2009-10-07 14:05:58Z jsuchome $
+ * $Id: save_config_finish.ycp 59739 2009-11-24 15:19:03Z kmachalkova $
*
*/
@@ -141,11 +141,20 @@
contains (Product::flags, "usercwd") ? "yes" : "no");
SCR::Write (.sysconfig.suseconfig, nil);
- // FIXME text freeze: progress (update count in Info too)
+ Progress::NextStep ();
+ // progress step title
+ Progress::Title (_("Saving security settings..."));
SCR::Write (.sysconfig.security.CHECK_SIGNATURES,
SignatureCheckDialogs::CheckSignatures ());
SCR::Write (.sysconfig.security, nil);
+ Progress::NextStep ();
+ // progress step title
+ Progress::Title (_("Saving boot scripts settings..."));
+ boolean run_in_parallel = ProductFeatures::GetBooleanFeature( "globals", "run_init_scripts_in_parallel");
+ SCR::Write (.sysconfig.boot.RUN_PARALLEL, run_in_parallel ? "yes" : "no" );
+ SCR::Write (.sysconfig.boot, nil);
+
// save supportconfig
if(SCR::Read(.target.size,"/etc/install.inf") > 0) {
string url = (string)SCR::Read(.etc.install_inf.supporturl);
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-installation-2.18.33/VERSION new/yast2-installation-2.19.0/VERSION
--- old/yast2-installation-2.18.33/VERSION 2009-10-23 07:40:54.000000000 +0200
+++ new/yast2-installation-2.19.0/VERSION 2009-11-24 16:27:47.000000000 +0100
@@ -1 +1 @@
-2.18.33
+2.19.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package nautilus for openSUSE:Factory
checked in at Wed Nov 25 14:26:15 CET 2009.
--------
--- GNOME/nautilus/nautilus.changes 2009-09-21 22:23:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2009-11-13 22:43:35.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 13 22:43:06 CET 2009 - dimstar(a)opensuse.org
+
+- Refresh nautilus-bnc363122-lockdown-context-menus.diff to apply
+ with fuzz=0.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.ONF3j0/_old 2009-11-25 14:25:46.000000000 +0100
+++ /var/tmp/diff_new_pack.ONF3j0/_new 2009-11-25 14:25:46.000000000 +0100
@@ -36,7 +36,7 @@
License: GPL v2 or later
Group: Productivity/File utilities
Version: 2.28.0
-Release: 1
+Release: 2
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.…
Url: http://www.gnome.org
++++++ nautilus-bnc363122-lockdown-context-menus.diff ++++++
--- /var/tmp/diff_new_pack.ONF3j0/_old 2009-11-25 14:25:47.000000000 +0100
+++ /var/tmp/diff_new_pack.ONF3j0/_new 2009-11-25 14:25:47.000000000 +0100
@@ -6,11 +6,11 @@
This adds an /apps/nautilus/lockdown/disable_context_menus GConf key;
if set to true, it will disable all the contextual menus on file views.
-Index: nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
+Index: nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in
===================================================================
---- nautilus-2.23.4.orig/libnautilus-private/apps_nautilus_preferences.schemas.in
-+++ nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
-@@ -1019,6 +1019,21 @@ most cases, this should be left alone. -
+--- nautilus-2.28.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in
++++ nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in
+@@ -1186,6 +1186,21 @@ most cases, this should be left alone. -
</long>
</locale>
</schema>
@@ -33,10 +33,10 @@
+
</schemalist>
</gconfschemafile>
-Index: nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
+Index: nautilus-2.28.0/libnautilus-private/nautilus-debug-log.h
===================================================================
---- nautilus-2.23.4.orig/libnautilus-private/nautilus-debug-log.h
-+++ nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
+--- nautilus-2.28.0.orig/libnautilus-private/nautilus-debug-log.h
++++ nautilus-2.28.0/libnautilus-private/nautilus-debug-log.h
@@ -30,6 +30,7 @@
#define NAUTILUS_DEBUG_LOG_DOMAIN_USER "USER" /* always enabled */
#define NAUTILUS_DEBUG_LOG_DOMAIN_ASYNC "async" /* when asynchronous notifications come in */
@@ -45,11 +45,11 @@
void nautilus_debug_log (gboolean is_milestone, const char *domain, const char *format, ...);
-Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
+Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c
===================================================================
---- nautilus-2.23.4.orig/libnautilus-private/nautilus-global-preferences.c
-+++ nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
-@@ -229,6 +229,10 @@ typedef struct
+--- nautilus-2.28.0.orig/libnautilus-private/nautilus-global-preferences.c
++++ nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c
+@@ -236,6 +236,10 @@ typedef struct
* YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS.
*/
static const PreferenceDefault preference_defaults[] = {
@@ -59,25 +59,25 @@
+ },
{ NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW,
PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (FALSE)
-Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.h
+ GINT_TO_POINTER (TRUE)
+Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h
===================================================================
---- nautilus-2.23.4.orig/libnautilus-private/nautilus-global-preferences.h
-+++ nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.h
-@@ -30,6 +30,8 @@
-
- G_BEGIN_DECLS
+--- nautilus-2.28.0.orig/libnautilus-private/nautilus-global-preferences.h
++++ nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h
+@@ -33,6 +33,8 @@ G_BEGIN_DECLS
+ /* Whether exit when last window destroyed */
+ #define NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW "preferences/exit_with_last_window"
+#define NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS "lockdown/disable_context_menus"
+
/* Which theme is active */
#define NAUTILUS_PREFERENCES_THEME "/desktop/gnome/file_views/icon_theme"
-Index: nautilus-2.23.4/src/file-manager/fm-directory-view.c
+Index: nautilus-2.28.0/src/file-manager/fm-directory-view.c
===================================================================
---- nautilus-2.23.4.orig/src/file-manager/fm-directory-view.c
-+++ nautilus-2.23.4/src/file-manager/fm-directory-view.c
-@@ -7568,6 +7568,12 @@ fm_directory_view_pop_up_selection_conte
+--- nautilus-2.28.0.orig/src/file-manager/fm-directory-view.c
++++ nautilus-2.28.0/src/file-manager/fm-directory-view.c
+@@ -8728,6 +8728,12 @@ fm_directory_view_pop_up_selection_conte
{
g_assert (FM_IS_DIRECTORY_VIEW (view));
@@ -90,7 +90,7 @@
/* Make the context menu items not flash as they update to proper disabled,
* etc. states by forcing menus to update now.
*/
-@@ -7597,6 +7603,12 @@ fm_directory_view_pop_up_background_cont
+@@ -8757,6 +8763,12 @@ fm_directory_view_pop_up_background_cont
{
g_assert (FM_IS_DIRECTORY_VIEW (view));
@@ -103,7 +103,7 @@
/* Make the context menu items not flash as they update to proper disabled,
* etc. states by forcing menus to update now.
*/
-@@ -7704,6 +7716,12 @@ fm_directory_view_pop_up_location_contex
+@@ -8864,6 +8876,12 @@ fm_directory_view_pop_up_location_contex
g_assert (FM_IS_DIRECTORY_VIEW (view));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package deltafs for openSUSE:Factory
checked in at Mon Nov 23 15:28:41 CET 2009.
--------
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/deltafs/deltafs.changes 2009-11-20 14:36:54.000000000 +0100
@@ -0,0 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 20 14:35:33 CET 2009 - mszeredi(a)suse.cz
+
+- add license file (bnc#557195)
+
+-------------------------------------------------------------------
+Thu Nov 19 18:02:50 CET 2009 - mszeredi(a)suse.cz
+
+- initial version: 1.0
calling whatdependson for head-i586
New:
----
deltafs-1.0.tar.bz2
deltafs.changes
deltafs.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deltafs.spec ++++++
#
# spec file for package deltafs (Version 1.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: deltafs
BuildRequires: fuse-devel licenses pkg-config
Requires: fuse licenses
Summary: Delta Filesystem
Version: 1.0
Release: 1
License: GPL v2 only
Group: System/Filesystems
Source: %{name}-%{version}.tar.bz2
Url: http://git.kernel.org/?p=linux/kernel/git/mszeredi/deltafs.git
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Deltafs combines a read-only lower directory and a read-write upper
directory into a new filesystem. Currently it works very similarly to
a union filesystem, where upon modification whole files are copied up
to the upper layer. There are plans to store differences more
efficiently in the future.
Authors:
--------
Miklos Szeredi <miklos(a)szeredi.hu>
%prep
%setup -n %{name}-%{version}
%build
%{?suse_update_config:%{suse_update_config -f}}
aclocal
autoheader
automake --foreign --add-missing
autoconf
%configure
make
%install
make DESTDIR="$RPM_BUILD_ROOT" install
ln -sf ../../licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc %{_mandir}/*/*
%{_bindir}/*
%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
Hello community,
here is the log from the commit of package liblastfm for openSUSE:Factory
checked in at Mon Nov 23 15:20:47 CET 2009.
--------
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/liblastfm/liblastfm.changes 2009-11-20 14:36:41.000000000 +0100
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 20 14:36:16 CET 2009 - dmueller(a)suse.de
+
+- fix packaging (spec file name, no functional change)
+
+-------------------------------------------------------------------
+Sat Sep 5 18:57:13 CEST 2009 - buschmann23(a)opensuse.org - 0.3.0
+
+- initial package
+- version 0.3.0
calling whatdependson for head-i586
New:
----
liblastfm-0.3.0-qmake.patch
liblastfm-0.3.0.tar.bz2
liblastfm.changes
liblastfm.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ liblastfm.spec ++++++
#
# spec file for package liblastfm (Version 0.3.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright 2009 Buschmann <buschmann23(a)opensuse.org>
#
# 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
BuildRequires: fdupes fftw3-devel libsamplerate-devel ruby
BuildRequires: libqt4-devel >= 4.4.0
Name: liblastfm
Summary: A Qt C++ Library for the Last.fm Webservices
Version: 0.3.0
Release: 1
License: GPL v3 only
Group: System/Libraries
Source0: liblastfm-%{version}.tar.bz2
Patch0: liblastfm-%{version}-qmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: yes
Requires: ruby
Url: http://github.com/mxcl/liblastfm
%description
liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software. It is officially supported software developed
by Last.fm staff.
Authors:
-------
Max Howell
Jono Cole
Doug Mansell
%package -n liblastfm0
License: GPL v3 only
Group: System/Libraries
Summary: A Qt C++ Library for the Last.fm Webservices
%description -n liblastfm0
liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software. It is officially supported software developed
by Last.fm staff.
Authors:
-------
Max Howell
Jono Cole
Doug Mansell
%package -n liblastfm-devel
License: GPL v3 only
Group: Development/Libraries/C and C++
Summary: Development Files for the Last.fm Webservices Qt C++ Library
Requires: liblastfm0 = %{version}
%description -n liblastfm-devel
liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software. It is officially supported software developed
by Last.fm staff.
Development files.
Authors:
-------
Max Howell
Jono Cole
Doug Mansell
%prep
%setup -qn liblastfm-%{version}
%patch0
%build
LIB=%{_lib} ; export LIB
./configure --prefix %{_prefix} --release
%{__make} %{?jobs:-j %{jobs}} VERBOSE=1
%install
%{__make} DESTDIR=%buildroot install
%fdupes -s $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%post -n liblastfm0 -p /sbin/ldconfig
%postun -n liblastfm0 -p /sbin/ldconfig
%files -n liblastfm0
%defattr(644,root,root,755)
%doc COPYING README
%{_libdir}/liblastfm.so.*
%{_libdir}/liblastfm_fingerprint.so.*
%files -n liblastfm-devel
%defattr(644,root,root,755)
%{_libdir}/liblastfm_fingerprint.so
%{_libdir}/liblastfm.so
%{_includedir}/lastfm.h
%{_includedir}/lastfm
%changelog
++++++ liblastfm-0.3.0-qmake.patch ++++++
--- src/lastfm.pro~ 2009-09-05 18:27:53.000000000 +0200
+++ src/lastfm.pro 2009-09-05 18:27:53.000000000 +0200
@@ -18,4 +18,4 @@
}
}
-target.path = /lib
\ Kein Zeilenumbruch am Dateiende.
+target.path = /$$(LIB)
\ Kein Zeilenumbruch am Dateiende.
--- src/fingerprint/fingerprint.pro~ 2009-09-05 18:28:09.000000000 +0200
+++ src/fingerprint/fingerprint.pro 2009-09-05 18:28:09.000000000 +0200
@@ -26,4 +26,4 @@
}
INSTALLS = target
-target.path = /lib
+target.path = /$$(LIB)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package perl-Task-Weaken for openSUSE:Factory
checked in at Mon Nov 23 15:09:44 CET 2009.
--------
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Task-Weaken/perl-Task-Weaken.changes 2009-11-15 18:54:57.000000000 +0100
@@ -0,0 +1,11 @@
+-------------------------------------------------------------------
+Sun Nov 15 18:53:14 CET 2009 - dmueller(a)suse.de
+
+- update to 1.03:
+ - Updating to flush out some old CPAN Testers results
+
+-------------------------------------------------------------------
+Tue Jul 15 16:18:24 CEST 2008 - jw(a)suse.de
+
+- initial check in version 1.02
+
calling whatdependson for head-i586
New:
----
perl-Task-Weaken.changes
perl-Task-Weaken.spec
Task-Weaken-1.03.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Task-Weaken.spec ++++++
#
# spec file for package perl-Task-Weaken (Version 1.03)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: perl-Task-Weaken
%define modname Task-Weaken
Version: 1.03
Release: 1
Url: http://search.cpan.org/~nuffin/Tie-RefHash-Weak-0.08/lib/Tie/RefHash/Weak.pm
Summary: Task::Weaken - Ensure that a platform has weaken support
Requires: perl = %{perl_version}
BuildRequires: perl
License: GPL/Artistic
Group: Development/Libraries/Perl
Source: %{modname}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
One recurring problem in modules that use Scalar::Util's weaken function is that it is not present in the pure-perl variant.
While this isn't necesarily always a problem in a straight CPAN-based Perl environment, some operating system distributions only include the pure-Perl versions, don't include the XS version, and so weaken is then "missing" from the platform, despite passing a dependency on Scalar::Util successfully.
Authors:
--------
Adam Kennedy <adamk(a)cpan.org>
%prep
%setup -q -n %{modname}-%{version}
%build
echo y | perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"
make
make test
%install
make DESTDIR=$RPM_BUILD_ROOT install_vendor
%perl_process_packlist
%clean
rm -rf %{buildroot}
%files
%defattr(-, root, root)
%doc Changes README
%doc %{_mandir}/man?/*
%{perl_vendorlib}/Task
%{perl_vendorarch}/auto/Task
/var/adm/perl-modules/%{name}
%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
Hello community,
here is the log from the commit of package kdewebdev3 for openSUSE:Factory
checked in at Mon Nov 23 15:07:03 CET 2009.
--------
--- KDE/kdewebdev3/kdewebdev3.changes 2009-08-16 13:57:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdewebdev3/kdewebdev3.changes 2009-11-20 21:36:33.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 20 21:35:40 UTC 2009 - beineri(a)opensuse.org
+
+- update patch to apply without fuzz
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdewebdev3.spec ++++++
--- /var/tmp/diff_new_pack.AMJICr/_old 2009-11-23 15:06:44.000000000 +0100
+++ /var/tmp/diff_new_pack.AMJICr/_new 2009-11-23 15:06:44.000000000 +0100
@@ -29,7 +29,7 @@
Group: Productivity/Publishing/HTML/Tools
Summary: KDE Web Development Suite
Version: 3.5.10
-Release: 18
+Release: 19
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://kdewebdev.org
Source0: kdewebdev-%{version}.tar.bz2
++++++ disable-icon.diff ++++++
--- /var/tmp/diff_new_pack.AMJICr/_old 2009-11-23 15:06:44.000000000 +0100
+++ /var/tmp/diff_new_pack.AMJICr/_new 2009-11-23 15:06:44.000000000 +0100
@@ -1,8 +1,8 @@
---- kxsldbg/kxsldbg.desktop
-+++ kxsldbg/kxsldbg.desktop
-@@ -40,7 +40,6 @@
- GenericName[xx]=xxXSLT Debuggerxx
- GenericName[zh_CN]=XSLT 调试器
+--- kxsldbg/kxsldbg.desktop 2009/11/20 21:35:18 1.1
++++ kxsldbg/kxsldbg.desktop 2009/11/20 21:35:23
+@@ -46,7 +46,6 @@
+ GenericName[zh_HK]=XSLT 除錯器
+ GenericName[zh_TW]=XSLT 除錯器
Exec=kxsldbg %i %m -caption "%c"
-Icon=kxsldbg
Type=Application
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package klamav for openSUSE:Factory
checked in at Mon Nov 23 15:06:28 CET 2009.
--------
--- KDE/klamav/klamav.changes 2009-06-03 18:31:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/klamav/klamav.changes 2009-11-20 21:06:19.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 20 21:05:29 UTC 2009 - binner(a)kde.org
+
+- update patch to apply without fuzz
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ klamav.spec ++++++
--- /var/tmp/diff_new_pack.Ip3S1F/_old 2009-11-23 15:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Ip3S1F/_new 2009-11-23 15:06:01.000000000 +0100
@@ -29,7 +29,7 @@
Summary: Frontend for clamav
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 0.46
-Release: 2
+Release: 3
Source0: klamav-%{version}-source.tar.bz2
Patch4: external-sqlite.diff
Patch7: build-c.diff
++++++ build-c.diff ++++++
--- /var/tmp/diff_new_pack.Ip3S1F/_old 2009-11-23 15:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Ip3S1F/_new 2009-11-23 15:06:01.000000000 +0100
@@ -1,7 +1,7 @@
--- src/klammail/Makefile.am
+++ src/klammail/Makefile.am
-@@ -2,7 +2,7 @@ bin_PROGRAMS = klammail
- klammail_SOURCES = clamdmail.c options.c treewalk.c output.c memory.c cfgparser.c client.c
+@@ -2,7 +2,7 @@
+ klammail_SOURCES = clamdmail.c options.c output.c memory.c cfgparser.c client.c
# set the include path found by configure
-INCLUDES= $(all_includes)
++++++ klamav-gcc43.diff ++++++
--- /var/tmp/diff_new_pack.Ip3S1F/_old 2009-11-23 15:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Ip3S1F/_new 2009-11-23 15:06:01.000000000 +0100
@@ -7,4 +7,4 @@
+#include <stdlib.h>
#include <vector>
#include <string>
- #include <stdio.h> // sprintf
+ #include <stdlib.h> // sprintf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
23 Nov '09
Hello community,
here is the log from the commit of package libcompizconfig-backend-gconf for openSUSE:Factory
checked in at Mon Nov 23 15:05:39 CET 2009.
--------
--- libcompizconfig-backend-gconf/libcompizconfig-backend-gconf.changes 2009-04-15 17:20:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/libcompizconfig-backend-gconf/libcompizconfig-backend-gconf.changes 2009-11-13 12:06:10.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Nov 13 10:05:15 CET 2009 - dimstar(a)opensuse.org
+
+- Update to version 0.8.4:
+ + lp#407020 - Fix crash
+ + Fix setting integration for screenshot and terminal commands
+ + Don't allow empty modifiers for mouse_button_modifier
+ + Sync metacity with staticswitcher instead of switcher.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
compizconfig-backend-gconf-0.7.8.tar.bz2
New:
----
compizconfig-backend-gconf-0.8.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcompizconfig-backend-gconf.spec ++++++
--- /var/tmp/diff_new_pack.ugNRhp/_old 2009-11-23 15:03:24.000000000 +0100
+++ /var/tmp/diff_new_pack.ugNRhp/_new 2009-11-23 15:03:24.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libcompizconfig-backend-gconf (Version 0.7.8 )
+# spec file for package libcompizconfig-backend-gconf (Version 0.8.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,30 +18,43 @@
Name: libcompizconfig-backend-gconf
-BuildRequires: autoconf automake compiz-devel compiz-gnome gconf2-devel glib2-devel gtk2-devel intltool libcompizconfig-devel libxml2-devel libxslt-devel pkg-config pyrex python-compizconfig python-devel
-Url: http://opencompositing.org
+Version: 0.8.4
+Release: 1
License: GPL v2 or later
+Summary: This package contains gconf backend for Compizconfig-settings-manager(ccsm)
+Url: http://opencompositing.org
Group: System/X11/Utilities
+Source: compizconfig-backend-gconf-%{version}.tar.bz2
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: compiz-devel
+BuildRequires: compiz-gnome
+BuildRequires: gconf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+BuildRequires: intltool
+BuildRequires: libcompizconfig-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: pkg-config
+BuildRequires: pyrex
+BuildRequires: python-compizconfig
+BuildRequires: python-devel
PreReq: %fillup_prereq
-Version: 0.7.8
-Release: 2
-Requires: compiz libcompizconfig python-compizconfig python-xml libsexy libxml2-python
+Requires: compiz
+Requires: libcompizconfig
+Requires: libsexy
+Requires: libxml2-python
+Requires: python-compizconfig
+Requires: python-xml
Provides: libcompizconfig-backend
-Summary: This package contains gconf backend for Compizconfig-settings-manager(ccsm)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ia64
-Source: compizconfig-backend-gconf-%{version}.tar.bz2
%description
This package contains gconf backend for
Compizconfig-settings-manager(ccsm).
-
-
-Authors:
---------
- Dennis Kasprzyk <onestone(a)beryl-project.org>
-
%prep
%setup -q -n compizconfig-backend-gconf-%{version}
@@ -51,7 +64,7 @@
%install
%makeinstall
-find %buildroot \( -name \*.la \) -print0 | xargs -0 rm -f
+find %{buildroot} \( -name \*.la \) -print0 | xargs -0 rm -f
%clean
%__rm -rf %{buildroot}
++++++ compizconfig-backend-gconf-0.7.8.tar.bz2 -> compizconfig-backend-gconf-0.8.4.tar.bz2 ++++++
++++ 10997 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/compizconfig-backend-gconf-0.7.8/settings-backend/gconf.c new/compizconfig-backend-gconf-0.8.4/settings-backend/gconf.c
--- old/compizconfig-backend-gconf-0.7.8/settings-backend/gconf.c 2008-09-17 15:28:55.000000000 +0200
+++ new/compizconfig-backend-gconf-0.8.4/settings-backend/gconf.c 2009-10-14 02:40:31.000000000 +0200
@@ -115,15 +115,15 @@
} SpecialOption;
const SpecialOption specialOptions[] = {
- {"run_key", "core", FALSE,
+ {"run_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/panel_run_dialog", OptionKey},
- {"main_menu_key", "core", FALSE,
+ {"main_menu_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/panel_main_menu", OptionKey},
- {"run_command_screenshot_key", "core", FALSE,
+ {"run_command_screenshot_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_screenshot", OptionKey},
- {"run_command_window_screenshot_key", "core", FALSE,
+ {"run_command_window_screenshot_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_window_screenshot", OptionKey},
- {"run_command_terminal_key", "core", FALSE,
+ {"run_command_terminal_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_terminal", OptionKey},
{"toggle_window_maximized_key", "core", FALSE,
@@ -172,9 +172,9 @@
{"fullscreen_visual_bell", "fade", TRUE,
METACITY "/general/visual_bell_type", OptionSpecial},
- {"next_key", "switcher", FALSE,
+ {"next_key", "staticswitcher", FALSE,
METACITY "/global_keybindings/switch_windows", OptionKey},
- {"prev_key", "switcher", FALSE,
+ {"prev_key", "staticswitcher", FALSE,
METACITY "/global_keybindings/switch_windows_backward", OptionKey},
{"toggle_sticky_key", "extrawm", FALSE,
@@ -182,54 +182,54 @@
{"toggle_fullscreen_key", "extrawm", FALSE,
METACITY "/window_keybindings/toggle_fullscreen", OptionKey},
- {"command0", "core", FALSE,
+ {"command0", "commands", FALSE,
METACITY "/keybinding_commands/command_1", OptionString},
- {"command1", "core", FALSE,
+ {"command1", "commands", FALSE,
METACITY "/keybinding_commands/command_2", OptionString},
- {"command2", "core", FALSE,
+ {"command2", "commands", FALSE,
METACITY "/keybinding_commands/command_3", OptionString},
- {"command3", "core", FALSE,
+ {"command3", "commands", FALSE,
METACITY "/keybinding_commands/command_4", OptionString},
- {"command4", "core", FALSE,
+ {"command4", "commands", FALSE,
METACITY "/keybinding_commands/command_5", OptionString},
- {"command5", "core", FALSE,
+ {"command5", "commands", FALSE,
METACITY "/keybinding_commands/command_6", OptionString},
- {"command6", "core", FALSE,
+ {"command6", "commands", FALSE,
METACITY "/keybinding_commands/command_7", OptionString},
- {"command7", "core", FALSE,
+ {"command7", "commands", FALSE,
METACITY "/keybinding_commands/command_8", OptionString},
- {"command8", "core", FALSE,
+ {"command8", "commands", FALSE,
METACITY "/keybinding_commands/command_9", OptionString},
- {"command9", "core", FALSE,
+ {"command9", "commands", FALSE,
METACITY "/keybinding_commands/command_10", OptionString},
- {"command10", "core", FALSE,
+ {"command10", "commands", FALSE,
METACITY "/keybinding_commands/command_11", OptionString},
- {"command11", "core", FALSE,
+ {"command11", "commands", FALSE,
METACITY "/keybinding_commands/command_12", OptionString},
- {"run_command0_key", "core", FALSE,
+ {"run_command0_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_1", OptionKey},
- {"run_command1_key", "core", FALSE,
+ {"run_command1_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_2", OptionKey},
- {"run_command2_key", "core", FALSE,
+ {"run_command2_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_3", OptionKey},
- {"run_command3_key", "core", FALSE,
+ {"run_command3_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_4", OptionKey},
- {"run_command4_key", "core", FALSE,
+ {"run_command4_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_5", OptionKey},
- {"run_command5_key", "core", FALSE,
+ {"run_command5_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_6", OptionKey},
- {"run_command6_key", "core", FALSE,
+ {"run_command6_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_7", OptionKey},
- {"run_command7_key", "core", FALSE,
+ {"run_command7_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_8", OptionKey},
- {"run_command8_key", "core", FALSE,
+ {"run_command8_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_9", OptionKey},
- {"run_command9_key", "core", FALSE,
+ {"run_command9_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_10", OptionKey},
- {"run_command10_key", "core", FALSE,
+ {"run_command10_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_11", OptionKey},
- {"run_command11_key", "core", FALSE,
+ {"run_command11_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_12", OptionKey},
{"rotate_to_1_key", "rotate", FALSE,
@@ -351,11 +351,11 @@
{"rotate_right_window_key", "rotate", FALSE,
METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
- {"command_screenshot", "core", FALSE,
+ {"command_screenshot", "gnomecompat", FALSE,
METACITY "/keybinding_commands/command_screenshot", OptionString},
- {"command_window_screenshot", "core", FALSE,
+ {"command_window_screenshot", "gnomecompat", FALSE,
METACITY "/keybinding_commands/command_window_screenshot", OptionString},
- {"command_terminal", "core", FALSE,
+ {"command_terminal", "gnomecompat", FALSE,
"/desktop/gnome/applications/terminal/exec", OptionString},
{"current_viewport", "thumbnail", TRUE,
@@ -406,19 +406,35 @@
for (i = 0; i < N_SOPTIONS; i++)
{
- if ((strcmp (setting->name, specialOptions[i].settingName) == 0) &&
- ((!setting->parent->name && !specialOptions[i].pluginName) ||
- (setting->parent->name && specialOptions[i].pluginName &&
- (strcmp (setting->parent->name,
- specialOptions[i].pluginName) == 0))) &&
- ((setting->isScreen && specialOptions[i].screen) ||
- (!setting->isScreen && !specialOptions[i].screen)))
- {
- if (index)
- *index = i;
- return TRUE;
+ const SpecialOption *opt = &specialOptions[i];
+
+ if (strcmp (setting->name, opt->settingName) != 0)
+ continue;
+
+ if (setting->parent->name)
+ {
+ if (!opt->pluginName)
+ continue;
+ if (strcmp (setting->parent->name, opt->pluginName) != 0)
+ continue;
+ }
+ else
+ {
+ if (opt->pluginName)
+ continue;
}
+
+ if (setting->isScreen && !opt->screen)
+ continue;
+ if (!setting->isScreen && opt->screen)
+ continue;
+
+ if (index)
+ *index = i;
+
+ return TRUE;
}
+
return FALSE;
}
@@ -1394,28 +1410,25 @@
g_slist_free (valueList);
}
-static void
+static Bool
setGnomeMouseButtonModifier (unsigned int modMask)
{
char *modifiers, *currentValue;
GError *err = NULL;
modifiers = ccsModifiersToString (modMask);
-
- if (!modifiers)
- modifiers = strdup ("");
if (!modifiers)
- return;
+ return FALSE;
- currentValue =
- gconf_client_get_string(client,
- METACITY "/general/mouse_button_modifier",
- &err);
+ currentValue = gconf_client_get_string (client,
+ METACITY
+ "/general/mouse_button_modifier",
+ &err);
if (err)
{
free (modifiers);
g_error_free (err);
- return;
+ return FALSE;
}
if (!currentValue || (strcmp (currentValue, modifiers) != 0))
@@ -1426,6 +1439,8 @@
g_free (currentValue);
free (modifiers);
+
+ return TRUE;
}
static void
@@ -1598,13 +1613,16 @@
unsigned int modMask;
modMask = setting->value->value.asButton.buttonModMask;
- setGnomeMouseButtonModifier (modMask);
- setButtonBindingForSetting (context, "move",
- "initiate_button", 1, modMask);
- setButtonBindingForSetting (context, "resize",
- "initiate_button", 2, modMask);
- setButtonBindingForSetting (context, "core",
- "window_menu_button", 3, modMask);
+ if (setGnomeMouseButtonModifier (modMask))
+ {
+ setButtonBindingForSetting (context, "move",
+ "initiate_button", 1, modMask);
+ setButtonBindingForSetting (context, "resize",
+ "initiate_button", 2, modMask);
+ setButtonBindingForSetting (context, "core",
+ "window_menu_button",
+ 3, modMask);
+ }
}
}
break;
@@ -1816,17 +1834,20 @@
else
currentProfile = strdup (profile);
- if (strcmp (lastProfile, currentProfile) != 0)
+ if (!lastProfile || strcmp (lastProfile, currentProfile) != 0)
{
char *pathName;
- /* copy /apps/compiz tree to profile path */
- asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
- if (pathName)
- {
- copyGconfTree (context, COMPIZ, pathName,
- TRUE, "/schemas" COMPIZ);
- free (pathName);
+ if (lastProfile)
+ {
+ /* copy /apps/compiz tree to profile path */
+ asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
+ if (pathName)
+ {
+ copyGconfTree (context, COMPIZ, pathName,
+ TRUE, "/schemas" COMPIZ);
+ free (pathName);
+ }
}
/* reset /apps/compiz tree */
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/compizconfig-backend-gconf-0.7.8/VERSION new/compizconfig-backend-gconf-0.8.4/VERSION
--- old/compizconfig-backend-gconf-0.7.8/VERSION 2008-09-17 21:28:03.000000000 +0200
+++ new/compizconfig-backend-gconf-0.8.4/VERSION 2009-10-14 02:45:56.000000000 +0200
@@ -1 +1 @@
-VERSION=0.7.8
+VERSION=0.8.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package pgcalc for openSUSE:Factory
checked in at Mon Nov 23 15:02:59 CET 2009.
--------
--- KDE/pgcalc/pgcalc.changes 2007-06-01 08:21:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/pgcalc/pgcalc.changes 2009-11-20 21:08:21.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 20 21:07:30 UTC 2009 - binner(a)kde.org
+
+- update patch to apply without fuzz
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pgcalc.spec ++++++
--- /var/tmp/diff_new_pack.vNsee3/_old 2009-11-23 15:02:21.000000000 +0100
+++ /var/tmp/diff_new_pack.vNsee3/_new 2009-11-23 15:02:21.000000000 +0100
@@ -20,13 +20,13 @@
Name: pgcalc
BuildRequires: kdelibs3-devel
-License: GPL v2 or later; LGPL v2.1 or later
+License: GPL v2 or later ; LGPL v2.1 or later
Group: Productivity/Scientific/Math
Summary: Scientific Calculator, working in reversed polish notation mode
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.pgcalc.net
Version: 2.2
-Release: 263
+Release: 264
Source: %{name}2-%{version}-6.tar.gz
Patch: pgcalc.diff
Patch2: pgcalc-lcdcrash.diff
++++++ pgcalc-lcdcrash.diff ++++++
--- /var/tmp/diff_new_pack.vNsee3/_old 2009-11-23 15:02:22.000000000 +0100
+++ /var/tmp/diff_new_pack.vNsee3/_new 2009-11-23 15:02:22.000000000 +0100
@@ -1,6 +1,6 @@
diff -ur pgcalc/src/tlcd.cpp pgcalc2-2.2-4/src/tlcd.cpp
---- src/tlcd.cpp 2004-05-09 19:35:05.000000000 +0200
-+++ src/tlcd.cpp 2006-02-08 12:05:00.000000000 +0100
+--- src/tlcd.cpp 2009/11/20 21:06:50 1.1
++++ src/tlcd.cpp 2009/11/20 21:07:00
@@ -221,6 +221,9 @@
//---------------------------------------------------------------------------------------
void TLCDDisplay::drawText( int X, int Y, const char* Text, TLCDFont* AFont )
@@ -10,4 +10,4 @@
+
unsigned int j;
int x;
- //QPainter p( _owner );
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
23 Nov '09
Hello community,
here is the log from the commit of package compizconfig-settings-manager for openSUSE:Factory
checked in at Mon Nov 23 15:02:08 CET 2009.
--------
--- compizconfig-settings-manager/compizconfig-settings-manager.changes 2009-10-03 15:07:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/compizconfig-settings-manager/compizconfig-settings-manager.changes 2009-11-13 12:58:48.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 13 10:47:01 CET 2009 - dimstar(a)opensuse.org
+
+- Update to version 0.8.4:
+ + Remove obsolete icons
+ + Speed up startup by loading icons in the background
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ccsm-0.7.8.tar.bz2
New:
----
ccsm-0.8.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compizconfig-settings-manager.spec ++++++
--- /var/tmp/diff_new_pack.ddmMjj/_old 2009-11-23 15:01:42.000000000 +0100
+++ /var/tmp/diff_new_pack.ddmMjj/_new 2009-11-23 15:01:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package compizconfig-settings-manager (Version 0.7.8 )
+# spec file for package compizconfig-settings-manager (Version 0.8.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,22 +18,38 @@
Name: compizconfig-settings-manager
-BuildRequires: compiz-devel compiz-gnome gconf2-devel glib2-devel gtk2-devel intltool libcompizconfig-devel libxml2-devel libxslt-devel pkg-config pyrex python-compizconfig python-devel update-desktop-files
-Url: http://opencompositing.org
+Version: 0.8.4
+Release: 1
License: GPL v2 or later
-Group: System/X11/Utilities
-PreReq: %fillup_prereq
-Version: 0.7.8
-Release: 6
-Requires: compiz python-compizconfig python-xml libcompizconfig
-Obsoletes: ccs-settings
Summary: Settings Manager for Compiz (CCSM)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: http://opencompositing.org
+Group: System/X11/Utilities
Source: ccsm-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM compizconfig-settings-manager-profile-extensions.patch bgo#458343 rodrigo(a)novell.com
Patch1: compizconfig-settings-manager-profile-extensions.patch
# PATCH-FIX-OPENSUSE Don't warn about missing sexy-python
Patch2: unsexy.patch
+BuildRequires: compiz-devel
+BuildRequires: compiz-gnome
+BuildRequires: gconf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+BuildRequires: intltool
+BuildRequires: libcompizconfig-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: pkg-config
+BuildRequires: pyrex
+BuildRequires: python-compizconfig
+BuildRequires: python-devel
+BuildRequires: update-desktop-files
+PreReq: %fillup_prereq
+Requires: compiz
+Requires: libcompizconfig
+Requires: python-compizconfig
+Requires: python-xml
+Obsoletes: ccs-settings
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
%if %suse_version <= 1110
%define python_sitelib %{py_sitedir}
@@ -52,11 +68,11 @@
%patch2 -p0
%build
-./setup.py install --root=%buildroot --prefix=/usr
+./setup.py install --root=%{buildroot} --prefix=/usr
%install
-find %buildroot \( -name \*.a -o -name \*.la \) -print0 | xargs -0 rm -f
-%__ln_s %{_bindir}/ccsm %buildroot%{_bindir}/compizconfig-settings-manager
+find %{buildroot} \( -name \*.a -o -name \*.la \) -print0 | xargs -0 rm -f
+%__ln_s %{_bindir}/ccsm %{buildroot}%{_bindir}/compizconfig-settings-manager
%suse_update_desktop_file ccsm DesktopSettings
%find_lang ccsm
@@ -67,10 +83,11 @@
%defattr(-, root, root)
%{_bindir}/*
%{_datadir}/applications/*
-%dir %{_datadir}/ccsm
-%{_datadir}/ccsm/*
+%{_datadir}/ccsm/
%{_datadir}/icons/*
%dir %{python_sitelib}/ccm
%{python_sitelib}/*
+%dir %{_datadir}/locale/ml_IN
+%dir %{_datadir}/locale/ml_IN/LC_MESSAGES
%changelog
++++++ ccsm-0.7.8.tar.bz2 -> ccsm-0.8.4.tar.bz2 ++++++
++++ 11379 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