Hello community, here is the log from the commit of package yast2-slide-show for openSUSE:Factory checked in at 2014-04-16 07:45:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slide-show (Old) and /work/SRC/openSUSE:Factory/.yast2-slide-show.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slide-show" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slide-show/yast2-slide-show.changes 2013-11-19 10:57:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slide-show.new/yast2-slide-show.changes 2014-04-16 07:45:59.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 15 13:39:29 UTC 2014 - ke@suse.de + +- Add more SLES images. +- Use SLES contents for SLED, too. + +------------------------------------------------------------------- +Tue Apr 15 09:13:27 UTC 2014 - ke@suse.de + +- Add SLES test images. +- 3.1.2 + +------------------------------------------------------------------- +Mon Apr 14 14:20:32 UTC 2014 - ke@suse.de + +- Enable SLES; use contents provided by mge. +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-slide-show-3.1.0.tar.bz2 New: ---- yast2-slide-show-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slide-show.spec ++++++ --- /var/tmp/diff_new_pack.k1HtmW/_old 2014-04-16 07:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.k1HtmW/_new 2014-04-16 07:46:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-slide-show # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,19 +17,20 @@ Name: yast2-slide-show -Version: 3.1.0 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 # xml2po uses temporary files that do not like being called twice +# xml2po probably is not thread-safe. %define jobs 1 BuildRequires: docbook_4 BuildRequires: gnome-doc-utils BuildRequires: pkgconfig BuildRequires: sgml-skel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 %if 0%{?suse_version} > 1120 # was in gnome-doc-utils before BuildRequires: xml2po @@ -42,28 +43,28 @@ Source12: slideshow-sled-po.tar.gz %description -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SuSELinux -Summary: YaST2 - Slide Show (openSUSE) +Summary: YaST - Slide Show (openSUSE) Group: Metapackages %description SuSELinux -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLES -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Server) +Summary: YaST - Slide Show (SUSE Linux Enterprise Server) Group: Metapackages %description SLES -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLED -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Desktop) +Summary: YaST - Slide Show (SUSE Linux Enterprise Desktop) Group: Metapackages %description SLED -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %prep %setup -n %{name}-%{version} @@ -77,6 +78,12 @@ tar xf %{S:12} langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am +popd + +pushd SLES +tar xf %{S:12} +langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) +sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am popd %build ++++++ yast2-slide-show-3.1.0.tar.bz2 -> yast2-slide-show-3.1.3.tar.bz2 ++++++ Files old/yast2-slide-show-3.1.0/SLED/pic/01_welcome.png and new/yast2-slide-show-3.1.3/SLED/pic/01_welcome.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/02_cont_running_sys.png and new/yast2-slide-show-3.1.3/SLED/pic/02_cont_running_sys.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/02_innovation.png and new/yast2-slide-show-3.1.3/SLED/pic/02_innovation.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/03_best_managed_linux.png and new/yast2-slide-show-3.1.3/SLED/pic/03_best_managed_linux.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/03_connect.png and new/yast2-slide-show-3.1.3/SLED/pic/03_connect.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/04_cloud.png and new/yast2-slide-show-3.1.3/SLED/pic/04_cloud.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/04_office.png and new/yast2-slide-show-3.1.3/SLED/pic/04_office.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/05_inter_os.png and new/yast2-slide-show-3.1.3/SLED/pic/05_inter_os.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/05_music.png and new/yast2-slide-show-3.1.3/SLED/pic/05_music.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/06_graphics.png and new/yast2-slide-show-3.1.3/SLED/pic/06_graphics.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/06_modular.png and new/yast2-slide-show-3.1.3/SLED/pic/06_modular.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/07_greenIT.png and new/yast2-slide-show-3.1.3/SLED/pic/07_greenIT.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/07_life.png and new/yast2-slide-show-3.1.3/SLED/pic/07_life.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/08_desktop.png and new/yast2-slide-show-3.1.3/SLED/pic/08_desktop.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/08_security.png and new/yast2-slide-show-3.1.3/SLED/pic/08_security.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/09_openSUSE.png and new/yast2-slide-show-3.1.3/SLED/pic/09_openSUSE.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/09_scc.png and new/yast2-slide-show-3.1.3/SLED/pic/09_scc.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/10_easy-management.png and new/yast2-slide-show-3.1.3/SLED/pic/10_easy-management.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/10_more.png and new/yast2-slide-show-3.1.3/SLED/pic/10_more.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/11_hardware.png and new/yast2-slide-show-3.1.3/SLED/pic/11_hardware.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/12_interoperability.png and new/yast2-slide-show-3.1.3/SLED/pic/12_interoperability.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLED/slideshow.xml new/yast2-slide-show-3.1.3/SLED/slideshow.xml --- old/yast2-slide-show-3.1.0/SLED/slideshow.xml 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLED/slideshow.xml 2014-04-15 15:52:37.000000000 +0200 @@ -5,6 +5,9 @@ <!ENTITY suselinux "&suse; Linux"> <!ENTITY opensuse "openSUSE"> <!ENTITY suse-version "11.1"> +<!ENTITY sle "&suselinux; Enterprise"> +<!ENTITY sls "&sle; Server"> +<!ENTITY sld "&sle; Desktop"> ]> <!-- <table cellspacing="10" cellpadding="5"> --> <!-- <tr> --> @@ -13,264 +16,356 @@ <section> <title>Slide Show</title> + + <section label="01_sle12"> + <title>&sle; 12</title> + <itemizedlist> + <listitem> + <para> + Continuously Running Systems + </para> + </listitem> + <listitem> + <para> + Best Managed Linux + </para> + </listitem> + <listitem> + <para> + Made for Cloud + </para> + </listitem> + <listitem> + <para> + Most Interoperable Operating System + </para> + </listitem> + <listitem> + <para> + Modular Design + </para> + </listitem> + </itemizedlist> + </section> -<section label="01_welcome"> - <title>Welcome to SUSE Linux Enterprise Desktop</title> - -<para>SUSE Linux Enterprise Desktop is the industry's leading -enterprise-quality Linux operating system that is optimized and ready -for both, business and personal use. SUSE Linux Enterprise Desktop -provides market-leading usability, seamless interoperability with -existing enterprise computer systems, and dozens of essential office -applications that enable businesses to use Linux and open source with -confidence. Designed for general-purpose use, SUSE Linux Enterprise -Desktop can also be tailored to fit fixed-function or special-purpose -roles such as on technical workstations, kiosks, and thin clients.</para> -</section> -<section label="02_innovation"> - <title>The Latest Desktop Innovations</title> - -<para>Novell's leadership in desktop innovation is unparalleled. Combining -results from extensive and ongoing usability studies with an outstanding -technology vision, Novell introduces SUSE Linux Enterprise Desktop 11 as -the most integrated and powerful Linux desktop. SUSE Linux Enterprise -Desktop can be installed on a wide range of client devices including -desktops, notebooks, netbooks, nettops, workstations, and more and -includes all the applications you need to be productive at work -or home.</para> - -<para>Novell's sponsorship and industry leadership in key open source -projects such as the Linux kernel, OpenOffice.org, GNOME, Evolution, -NetworkManager, Banshee, Mono, Compiz, F-Spot, Beagle, and many others -illustrate Novell's unmatched innovation in the Linux desktop.</para> - -</section> -<section label="03_connect"> - <title>Connect and Communicate</title> - - <para>SUSE Linux Enterprise Desktop 11 provides all the tools you need - to communicate with the world.</para> - - <para>The Firefox Web browser is the best Web browser in the market. It - boasts a complete set of browser features and lightning-fast performance - out of the box, and delivers a rich user experience through plug-ins - such as Java, Novell Moonlight, Adobe Acrobat Reader, and Adobe - Flash Player, which are all included in SUSE Linux Enterprise Desktop - 11.</para> - - <para>Novell Evolution is a complete collaboration client suite - supporting collaboration open standards. It includes Novell GroupWise - and Microsoft Exchange connectivity for messaging, contact management, - calendaring and task management.</para> - - <para>SUSE Linux Enterprise Desktop also includes an instant messaging - client that lets you connect with people all over the world.</para> - - <para>So to always have you online NetworkManager, our easy-to-use - network configuration tool can access the most complex and secured - networks, including WEP, WPA, VPN and other technologies, or simply - the open wireless network from your coffee shop, and makes sure to keep - you connected to the Internet no matter where you are.</para> - -</section> -<section label="04_office"> - <title>Spreadsheets, Presentations, Text Documents and More</title> - <para>SUSE Linux Enterprise Desktop comes complete with the latest - version of the leading open source office productivity suite, - OpenOffice.org. OpenOffice.org Novell Edition comes with word - processing, spreadsheet, presentation, database, and drawing - applications.</para> - -<para>As the leading alternative to Microsoft Office, OpenOffice.org -Novell Edition fully supports the latest open document format standards, -the widest range of Microsoft Office file formats and many others.</para> - -<para>OpenOffice.org Novell Edition also provides enhanced VBA macro -support, an improved Solver, and pivot table capability. To spice up all -your presentations, OpenOffice.org Novell Edition has great new slide -transitions that nicely blend with our desktop effects.</para> - -</section> -<section label="05_music"> - <title>Banshee: Manage your Media Library</title> - -<para>Novell is proud to sponsor the open source Banshee project, -the easy-to-use and beautifully polished media management application. -Listen to music, manage your music library, burn your own music CDs, or -synchronize your music to your portable media player or smartphone to -be able to listen to your music on-the-go. Banshee also gives you the ability -to subscribe to a variety of sources, including streamed music and -podcasts.</para> - -<para>To ensure the highest quality recordings and playback, Novell -developed its own state of the art Advanced Audio Coding (AAC) encoder -and decoder.</para> - -<para>New to SUSE Linux Enterprise Desktop 11, Banshee enables you to -include videos into your media library, effortlessly letting you get -entertained and up-to-date with video podcasts directly from your Linux -desktop. Synchronize video podcasts to your portable media player for -viewing on-the-go.</para> - -<para>Discover new music through the use of greatly integrated Web -services like Last.fm radio.</para> - -</section> -<section label="06_graphics"> - <title>Photos, Images, Drawings, Graphics</title> - -<para>Our Photo management tool in SUSE Linux Enterprise Desktop could -very well be the most user-friendly one ever invented. Recognizing -virtually all digital cameras and photo storage devices automatically, -F-Spot will let you import and manage all your -photos in very few clicks. It keeps an original copy of your photos, allowing you to be -creative and try all kinds of modifications while making sure you never -lose any of those precious snapshots again. Uploading pictures to the -Internet has never been easier. Whether it is for printing or for your -friends and family to enjoy, your photos are just 1-click away.</para> - -<para>For advanced image manipulation and graphics creation, the -open-source community created GIMP. It is a fantastic and a complete -photo retouching, image composition and image authoring application. GIMP -has enough features to satisfy the most exacting artist.</para> - -<para>Wondering about advanced vector graphics? Then Inkscape is the right graphical software for -you. It is a versatile graphics solution using the W3C standard Scalable -Vector Graphics (SVG) file format. Inkscape natively supports opening -or importing SVG, SVGZ (gzipped SVG), PDF, and AI (Adobe Illustrator) -formats.</para> - -</section> -<section label="07_greenIT"> - <title>Linux Helps Reduce Your Carbon Footprint</title> - -<para>We are concerned about the environment. Whether you are a mobile -worker or desktop user, SUSE Linux Enterprise Desktop reduces your -power consumption without impacting your productivity in any way. With -increasing reliability, the system will maximize energy saving and will -even let you track it.</para> - -<para>Now with effective power management on the processor, chipsets, -platform and operating system level, Novell and its partners optimize -power consumption in order to provide you with the longest possible -battery life.</para> - -<para>Novell works with its hardware manufacturing partners to ensure -that their systems installed with SUSE Linux Enterprise Desktop earn -the ENERGY STAR qualification.</para> - -<para>By seamlessly providing remote desktop access, Novell aims to -promote more electronic collaboration and even reduce your need for -travel.</para> - -</section> -<section label="08_security"> - <title>Keep Your System Secure and Up-to-Date</title> - - <para>When your system is connected to the Internet, you will be happy - to know that we enabled the SUSE Linux Firewall to help secure - your system and data from intruders. We also included AppArmor, - the most effective and easy-to-use Linux application security system - available. It proactively protects the operating system and applications - from external or internal threats.</para> - - -<para>In SUSE Linux Enterprise Desktop 11, we have introduced a new -granular privilege system PolicyKit that greatly improves the ability -for users and applications to be granted access to privileged operations -when needed. Furthermore, we have improved wireless and wired -network security connectivity and data encryption capabilities.</para> - -<para>Novell is dedicated to promptly provide its users with the latest -security updates. To ensure that the latest security patches are installed -on your system, Novell provides a comprehensive resource management -solution that allows you to stay up-to-date with all security updates.</para> - -</section> - <section label="09_openSUSE"> - <title>openSUSE.org</title> + <section label="02_cont_running_sys"> + <title>Continuously Running Systems</title> + <para> + Snapshot & rollback for the full system + </para> + <para> + Have a well <emphasis>known state</emphasis> to which you can go + back, to give you <emphasis>peace of mind</emphasis> for: + </para> + <itemizedlist> + <listitem> + <para> + Kernel upgrades + </para> + </listitem> + <listitem> + <para> + Service pack installations + </para> + </listitem> + </itemizedlist> + </section> - <para>The openSUSE project is a worldwide community program sponsored by - Novell that promotes the use of Linux everywhere. Please visit opensuse.org - where you can find and join a community of users and developers who all have - the same goal in mind: to create and distribute the world's most usable - Linux distribution. openSUSE provides the base of our award-winning SUSE Linux - Enterprise products.</para> - - <para>The openSUSE Build Service is an open and complete distribution - development platform that provides a transparent infrastructure for - development of the openSUSE distribution. With the openSUSE Build Service, - you can easily find the latest open source packages you are looking for. It - provides a bridge between developers and users with feedback and rating - functionality. For developers it is an efficient place to build up groups and - work together through its project model.</para> - - <para>Zypp is our software management engine and open source project that - powers products like YaST, Zypper and ZENworks with a powerful dependency - resolver and a convenient package management API.</para> + <section label="03_best_managed_linux"> + <title>Best Managed Linux</title> + <itemizedlist> + <listitem> + <para> + <emphasis>YaST:</emphasis> the only integrated single system + management solution in the Linux world + </para> + <itemizedlist> + <listitem> + <para> + Write your own extensions in Ruby now! + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Wicked: a new framework for simplifying the complexity of Linux + network management + </para> + <itemizedlist> + <listitem> + <para> + Network configuration as a service + </para> + </listitem> + <listitem> + <para> + Smooth adoption & migration + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> </section> + <section label="04_cloud"> + <title>Made for Cloud</title> + <itemizedlist> + <listitem> + <para> + Reliable Host + </para> + <itemizedlist> + <listitem> + <para> + KVM and Xen support included </para> + </listitem> + <listitem> + <para> + Basis for OpenStack-based SUSE® Cloud + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Perfect Guest + </para> + <itemizedlist> + <listitem> + <para> + Works well on mainstream hypervisors: Xen, KVM, VMware® vSphere, + Microsoft® Hyper-V etc. + </para> + </listitem> + <listitem> + <para> + Available on Amazon® EC2, Microsoft® Azure, Google® Compute + Engine, and other 50+ public clouds + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section label="05_inter_os"> + <title>Most Interoperable Operating System</title> -<section label="10_easy-management"> - <title>Easy to Deploy and Manage</title> + <itemizedlist> + <listitem> + <para> + Networking – IPv6 + </para> + <itemizedlist> + <listitem> + <para> + Scalable network infrastructures + </para> + </listitem> + <listitem> + <para> + Compliant to USGv6 standard + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Operating Systems + </para> + <itemizedlist> + <listitem> + <para> + Windows: Samba 4 + </para> + <itemizedlist> + <listitem> + <para> + Active Directory integration + </para> + </listitem> + <listitem> + <para> + Out-of-the-box experience via YaST + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + UNIX & Linux: NFSv4.1 + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> -<para>SUSE Linux Enterprise supports many deployment strategies -providing system administrators flexible ways to customize and tailor -the distribution to their needs.</para> - -<para>AutoYaST is an integrated solution for installing one or more systems -automatically without user intervention. Installations are performed -using a control file with installation and configuration data.</para> - -<para>The openSUSE KIWI imaging system provides a complete operating -system image solution for supported hardware platforms as well as -virtualization systems.</para> - -<para>With these solutions combined with several key open source projects -such as GConf, PolicyKit and Firstboot, SUSE Linux Enterprise Desktop -is the easiest Linux desktop to deploy and manage.</para> + <section label="06_modular"> + <title>Modular Design</title> -</section> -<section label="11_hardware"> - <title>Certified for SUSE Linux Enterprise Desktop</title> + <para> + Five different modules give you balance between the latest + technologies and enterprise-level stability: + </para> + <itemizedlist> + <listitem> + <para> + Web and Scripting Module + </para> + </listitem> + <listitem> + <para> + Legacy Module + </para> + </listitem> + <listitem> + <para> + Toolchain Module + </para> + </listitem> + <listitem> + <para> + Public Cloud Module + </para> + </listitem> + <listitem> + <para> + … Module + </para> + </listitem> + </itemizedlist> + </section> + + <section label="07_life"> + <title>Lifecycle and LTSS</title> + + <para> + SUSE® Linux Enterprise Server: + </para> + <itemizedlist> + <listitem> + <para> + 13-year lifecycle + </para> + <itemizedlist> + <listitem> + <para> + 10 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + 5-year lifecycle per Service Pack + </para> + <itemizedlist> + <listitem> + <para> + 2 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Long Term Service Pack Support (LTSS) available for all releases + </para> + </listitem> + </itemizedlist> + </section> + <section label="08_desktop"> + <title>Desktop Experience</title> -<para>By successfully completing stringent compatibility testing -requirements, Novell's partners qualify their systems for SUSE Linux -Enterprise Desktop certification.</para> - -<para>With a system certified for SUSE Linux Enterprise Desktop you can -trustfully use our software to manage your media library, collaborate -on projects and stay connected with your friends.</para> - -<para>You can find all the systems that have passed logo certification -by visiting novell.com/desktop. Systems with certification fully take -advantage of SUSE Linux Enterprise Desktop to deliver rich Internet -experience, ease of use, and excellent performance.</para> - -<para>Novell is pleased to also be part of the Linux Driver Project -focused on working with manufacturers to create and maintain open source -Linux kernel drivers for all types of devices. Timely hardware enablement -for desktop components is achieved by porting drivers to the Linux kernel -that powers SUSE Linux Enterprise.</para> + <para> + GNOME 3 as the desktop environment for SUSE® Linux Enterprise 12 + provides two desktop experiences for you to chose from: + </para> + <itemizedlist> + <listitem> + <para> + Using GNOME 3's GNOME Shell you can explore next-generation desktop + features that can be used with a mouse and a touchscreen. + </para> + </listitem> + <listitem> + <para> + SUSE's default GNOME 3 Classic Mode utilizes the same modern + technology, while maintaining well known usage patterns. + </para> + </listitem> + </itemizedlist> + </section> -</section> -<section label="12_interoperability"> - <title>Interoperability: Work with Everyone</title> + <section label="09_scc"> + <title>SUSE Customer Center</title> -<para>SUSE Linux Enterprise Desktop is designed with today's heterogeneous -world in mind. It is fully capable to seamlessly integrate into existing -Windows file and print environments. In addition, it plugs into existing -Microsoft Active Directory and Novell eDirectory environments. With -its broad use of open standards, SUSE Linux Enterprise Desktop enables -you to share information across any IT system so that you can easily -communicate with all users around you.</para> - -<para>OpenOffice.org Novell Edition works with the widest range of -document formats including Open Document Format, Microsoft Office formats -(including OO XML), Works, WordPerfect and others.</para> - -<para>Furthermore, SUSE Linux Enterprise Desktop provides accessibility features -so that anyone can take advantage of the improved productivity and lower -cost that a Linux desktop provides.</para> + <para> + Discover a new way of managing your SUSE account and subscriptions + via one interface, anytime, anywhere! + </para> + <itemizedlist> + <listitem> + <para> + Centralize access to subscriptions and entitlements + </para> + </listitem> + <listitem> + <para> + Quick access to support tools + </para> + </listitem> + <listitem> + <para> + Easy way to provide feedback + </para> + </listitem> + </itemizedlist> + </section> + <section label="10_more"> + <title>More from SUSE ...</title> + <itemizedlist> + <listitem> + <para> + SUSE Linux Enterprise + </para> + </listitem> + <listitem> + <para> + High Availability Extension + </para> + </listitem> + <listitem> + <para> + SUSE Manager + </para> + </listitem> + <listitem> + <para> + SUSE Cloud + </para> + </listitem> + <listitem> + <para> + SUSE Storage + </para> + </listitem> + <listitem> + <para> + More + </para> + </listitem> + </itemizedlist> </section> </section> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLES/Makefile.am new/yast2-slide-show-3.1.3/SLES/Makefile.am --- old/yast2-slide-show-3.1.0/SLES/Makefile.am 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLES/Makefile.am 2014-04-15 15:52:37.000000000 +0200 @@ -1,16 +1,93 @@ # -# Makefile.am for slide-show/slide +# Makefile.am for slide-show/SLED # -instdir = /SuSE/SuSE-SLES/CD1/suse/setup/slide +instdir = /SuSE/SuSE-SLES/CD1/suse/setup/slide -# note: txt/*/*.rtf does not work. you get a dir called "txt/*"! -EXTRA_DIST = pic/*.png \ - txt/cs/*.rtf \ - txt/de/*.rtf \ - txt/en/*.rtf +fname = slideshow +# list of languages available in SVN +# CAUTION: Czech is "cs", not "cz"! Use the LANG abbrev, not the country! +langs = +# list of languages ready for distribution _and_ installation +dist_langs = $(langs) +# take the files from txt/LL/*.rtf +# txt/*/*.rtf does not work. you get a dir called "txt/*"! +dist_lang_files = $(addprefix txt/,$(addsuffix /*.rtf,$(dist_langs))) + +EXTRA_DIST = \ + $(fname).xml $(xsl_styles) \ + $(pofiles) \ + pic/*.png \ + $(dist_lang_files) + +xml = $(addsuffix .xml,$(langs)) +rtf = $(xml:.xml=.rtf) +valid = $(xml:.xml=.valid) +# nochunk = $(xml:.xml=.nochunk) +#pofiles = $(xml:.xml=.po) +# po/LL.po +pofiles=$(addprefix po/,$(addsuffix .po,$(langs))) +xsl_styles = $(fname).xsl + +SUFFIXES = .xml .rtf .valid .po .pot + +CLEANFILES = $(rtf) $(valid) $(xml) $(fname).pot + +XSLTPROC = @XSLTPROC@ +XMLLINT = @XMLLINT@ +XML2PO = @XML2PO@ + +MSGMERGE_UPDATE = @MSGMERGE@ --update + +all: validate rtf + +outdir: + rm -fr txt + mkdir txt + +rtf: $(rtf) +%.rtf: %.xml outdir + ll=`echo $< | sed "s/\.xml$$//"`; \ + mkdir txt/$$ll ; \ + $(XSLTPROC) --nonet --stringparam out.dir "txt/$$ll" \ + $(fname).xsl $< 1>/dev/null; \ + pushd txt/$$ll ; \ + for f in *.rtf ; do \ + sed -i 's/\/>/>/;s/%imagedir%/\&imagedir;/' $$f; \ + done ; \ + popd + +validate: $(valid) +%.valid: %.xml + $(XMLLINT) --nonet --valid --noout $< && touch $@ + +pot: $(fname).pot +$(fname).pot: $(fname).xml + $(XMLLINT) --nonet --valid --noout $(fname).xml + $(XML2PO) --expand-all-entities -o $(fname).pot $(fname).xml + +# re-merge po translation files +po: $(pofiles) +$(pofiles): $(fname).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + echo "$(MSGMERGE_UPDATE) po/$${lang}.po $(fname).pot"; \ + if [ $${lang} = en ]; then \ + msgen -o po/$${lang}.po $(fname).pot ;\ + else $(MSGMERGE_UPDATE) po/$${lang}.po $(fname).pot ; fi + +xml: $(xml) +%.xml: po/%.po + @lang=`echo $@ | sed -e 's,.*/,,' -e 's,$(fname)_/,,' -e 's/\.xml$$//'`; \ + echo "$(XML2PO) -p po/$${lang}.po -o $${lang}.xml $(fname).pot"; \ + $(XML2PO) -p po/$${lang}.po -o $${lang}.xml $(fname).xml + +# rndir=$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) install-data-local: +# $(mkinstalldirs) $(rndir) +# for file in $(html); do \ +# $(INSTALL_DATA) $$file $(rndir) ; \ +# done mkdir -p $(DESTDIR)/$(instdir) -test -d $(srcdir)/txt && cp -a $(srcdir)/txt $(DESTDIR)/$(instdir) -test -d $(srcdir)/pic && cp -a $(srcdir)/pic $(DESTDIR)/$(instdir) Files old/yast2-slide-show-3.1.0/SLES/pic/01_welcome.png and new/yast2-slide-show-3.1.3/SLES/pic/01_welcome.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/02_cont_running_sys.png and new/yast2-slide-show-3.1.3/SLES/pic/02_cont_running_sys.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/02_platforms.png and new/yast2-slide-show-3.1.3/SLES/pic/02_platforms.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/03_best_managed_linux.png and new/yast2-slide-show-3.1.3/SLES/pic/03_best_managed_linux.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/03_ul.png and new/yast2-slide-show-3.1.3/SLES/pic/03_ul.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/04_cloud.png and new/yast2-slide-show-3.1.3/SLES/pic/04_cloud.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/04_maintenance.png and new/yast2-slide-show-3.1.3/SLES/pic/04_maintenance.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/05_certification.png and new/yast2-slide-show-3.1.3/SLES/pic/05_certification.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/05_inter_os.png and new/yast2-slide-show-3.1.3/SLES/pic/05_inter_os.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/06_family.png and new/yast2-slide-show-3.1.3/SLES/pic/06_family.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/06_modular.png and new/yast2-slide-show-3.1.3/SLES/pic/06_modular.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/07_life.png and new/yast2-slide-show-3.1.3/SLES/pic/07_life.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/07_oes.png and new/yast2-slide-show-3.1.3/SLES/pic/07_oes.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/08_desktop.png and new/yast2-slide-show-3.1.3/SLES/pic/08_desktop.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/08_firewall.png and new/yast2-slide-show-3.1.3/SLES/pic/08_firewall.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/09_lotus.png and new/yast2-slide-show-3.1.3/SLES/pic/09_lotus.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/09_scc.png and new/yast2-slide-show-3.1.3/SLES/pic/09_scc.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/10_more.png and new/yast2-slide-show-3.1.3/SLES/pic/10_more.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLES/slideshow.xml new/yast2-slide-show-3.1.3/SLES/slideshow.xml --- old/yast2-slide-show-3.1.0/SLES/slideshow.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLES/slideshow.xml 2014-04-15 15:52:37.000000000 +0200 @@ -0,0 +1,371 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY yast "YaST"> +<!ENTITY suse "SUSE"> +<!ENTITY suselinux "&suse; Linux"> +<!ENTITY opensuse "openSUSE"> +<!ENTITY suse-version "11.1"> +<!ENTITY sle "&suselinux; Enterprise"> +<!ENTITY sls "&sle; Server"> +<!ENTITY sld "&sle; Desktop"> +]> +<!-- <table cellspacing="10" cellpadding="5"> --> +<!-- <tr> --> +<!-- <td valign="top"><img src="&imagedir;/01_welcome.png" width="150" valign="top"></td> --> +<!-- <td> --> + +<section> + <title>Slide Show</title> + + <section label="01_sle12"> + <title>&sle; 12</title> + <itemizedlist> + <listitem> + <para> + Continuously Running Systems + </para> + </listitem> + <listitem> + <para> + Best Managed Linux + </para> + </listitem> + <listitem> + <para> + Made for Cloud + </para> + </listitem> + <listitem> + <para> + Most Interoperable Operating System + </para> + </listitem> + <listitem> + <para> + Modular Design + </para> + </listitem> + </itemizedlist> + </section> + + <section label="02_cont_running_sys"> + <title>Continuously Running Systems</title> + <para> + Snapshot & rollback for the full system + </para> + <para> + Have a well <emphasis>known state</emphasis> to which you can go + back, to give you <emphasis>peace of mind</emphasis> for: + </para> + <itemizedlist> + <listitem> + <para> + Kernel upgrades + </para> + </listitem> + <listitem> + <para> + Service pack installations + </para> + </listitem> + </itemizedlist> + </section> + + <section label="03_best_managed_linux"> + <title>Best Managed Linux</title> + <itemizedlist> + <listitem> + <para> + <emphasis>YaST:</emphasis> the only integrated single system + management solution in the Linux world + </para> + <itemizedlist> + <listitem> + <para> + Write your own extensions in Ruby now! + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Wicked: a new framework for simplifying the complexity of Linux + network management + </para> + <itemizedlist> + <listitem> + <para> + Network configuration as a service + </para> + </listitem> + <listitem> + <para> + Smooth adoption & migration + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section label="04_cloud"> + <title>Made for Cloud</title> + <itemizedlist> + <listitem> + <para> + Reliable Host + </para> + <itemizedlist> + <listitem> + <para> + KVM and Xen support included </para> + </listitem> + <listitem> + <para> + Basis for OpenStack-based SUSE® Cloud + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Perfect Guest + </para> + <itemizedlist> + <listitem> + <para> + Works well on mainstream hypervisors: Xen, KVM, VMware® vSphere, + Microsoft® Hyper-V etc. + </para> + </listitem> + <listitem> + <para> + Available on Amazon® EC2, Microsoft® Azure, Google® Compute + Engine, and other 50+ public clouds + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section label="05_inter_os"> + <title>Most Interoperable Operating System</title> + + <itemizedlist> + <listitem> + <para> + Networking – IPv6 + </para> + <itemizedlist> + <listitem> + <para> + Scalable network infrastructures + </para> + </listitem> + <listitem> + <para> + Compliant to USGv6 standard + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Operating Systems + </para> + <itemizedlist> + <listitem> + <para> + Windows: Samba 4 + </para> + <itemizedlist> + <listitem> + <para> + Active Directory integration + </para> + </listitem> + <listitem> + <para> + Out-of-the-box experience via YaST + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + UNIX & Linux: NFSv4.1 + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + + <section label="06_modular"> + <title>Modular Design</title> + + <para> + Five different modules give you balance between the latest + technologies and enterprise-level stability: + </para> + <itemizedlist> + <listitem> + <para> + Web and Scripting Module + </para> + </listitem> + <listitem> + <para> + Legacy Module + </para> + </listitem> + <listitem> + <para> + Toolchain Module + </para> + </listitem> + <listitem> + <para> + Public Cloud Module + </para> + </listitem> + <listitem> + <para> + … Module + </para> + </listitem> + </itemizedlist> + </section> + + <section label="07_life"> + <title>Lifecycle and LTSS</title> + + <para> + SUSE® Linux Enterprise Server: + </para> + <itemizedlist> + <listitem> + <para> + 13-year lifecycle + </para> + <itemizedlist> + <listitem> + <para> + 10 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + 5-year lifecycle per Service Pack + </para> + <itemizedlist> + <listitem> + <para> + 2 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Long Term Service Pack Support (LTSS) available for all releases + </para> + </listitem> + </itemizedlist> + </section> + <section label="08_desktop"> + <title>Desktop Experience</title> + + <para> + GNOME 3 as the desktop environment for SUSE® Linux Enterprise 12 + provides two desktop experiences for you to chose from: + </para> + <itemizedlist> + <listitem> + <para> + Using GNOME 3's GNOME Shell you can explore next-generation desktop + features that can be used with a mouse and a touchscreen. + </para> + </listitem> + <listitem> + <para> + SUSE's default GNOME 3 Classic Mode utilizes the same modern + technology, while maintaining well known usage patterns. + </para> + </listitem> + </itemizedlist> + </section> + + <section label="09_scc"> + <title>SUSE Customer Center</title> + + <para> + Discover a new way of managing your SUSE account and subscriptions + via one interface, anytime, anywhere! + </para> + <itemizedlist> + <listitem> + <para> + Centralize access to subscriptions and entitlements + </para> + </listitem> + <listitem> + <para> + Quick access to support tools + </para> + </listitem> + <listitem> + <para> + Easy way to provide feedback + </para> + </listitem> + </itemizedlist> + </section> + <section label="10_more"> + <title>More from SUSE ...</title> + + <itemizedlist> + <listitem> + <para> + SUSE Linux Enterprise + </para> + </listitem> + <listitem> + <para> + High Availability Extension + </para> + </listitem> + <listitem> + <para> + SUSE Manager + </para> + </listitem> + <listitem> + <para> + SUSE Cloud + </para> + </listitem> + <listitem> + <para> + SUSE Storage + </para> + </listitem> + <listitem> + <para> + More + </para> + </listitem> + </itemizedlist> + </section> +</section> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLES/slideshow.xsl new/yast2-slide-show-3.1.3/SLES/slideshow.xsl --- old/yast2-slide-show-3.1.0/SLES/slideshow.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLES/slideshow.xsl 2014-04-15 15:52:37.000000000 +0200 @@ -0,0 +1,96 @@ +<?xml version='1.0'?> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:exsl="http://exslt.org/common" + extension-element-prefixes="exsl"> + +<xsl:output method="html" encoding = "UTF-8"/> +<xsl:param name="out.dir" select="'outdir'"/> + +<xsl:template match="section/section"> + <xsl:variable name="chunk.name" + select="@label"/> + <xsl:variable name="imgdir" + select="concat ($out.dir, '/', $chunk.name, '.rtf')"/> + + <xsl:choose> + <xsl:when test="element-available('exsl:document')"> + <exsl:document href = "{$imgdir}" + omit-xml-declaration = "yes" + method = "xml" + encoding = "UTF-8" + media-type = "print" + indent = "yes"> + <table> + <xsl:attribute name="cellspacing"> + <xsl:value-of select="'10'"/> + </xsl:attribute> + <xsl:attribute name="cellpadding"> + <xsl:value-of select="'5'"/> + </xsl:attribute> + + <tr> + <td> + <xsl:attribute name="valign"> + <xsl:value-of select="'top'"/> + </xsl:attribute> + <!-- <xsl:text><![CDATA[<img src="&imagedir;/]]></xsl:text> --> + <img> + <xsl:attribute name="src"> + <xsl:value-of select="concat('%imagedir%/', $chunk.name, '.png')"/> +</xsl:attribute> + + <xsl:attribute name="width"> + <xsl:value-of select="'150'"/> + </xsl:attribute> + <xsl:attribute name="valign"> + <xsl:value-of select="'top'"/> + </xsl:attribute> +<!-- <xsl:text><![CDATA[>]]></xsl:text> --> +</img> + </td> + <td> + <xsl:apply-templates /> + </td> + </tr> + </table> + </exsl:document> + </xsl:when> + <xsl:otherwise> + <xsl:message>exsl missing</xsl:message> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="section/section/title"> + <h2> + <xsl:apply-templates /> + </h2> +</xsl:template> + +<xsl:template match="para"> + <p> + <xsl:apply-templates /> + </p> +</xsl:template> + +<xsl:template match="itemizedlist"> + <ul><xsl:apply-templates /></ul> +</xsl:template> +<xsl:template match="orderedlist"> + <ol><xsl:apply-templates /></ol> +</xsl:template> +<xsl:template match="listitem"> + <li><xsl:apply-templates /></li> +</xsl:template> +<xsl:template match="emphasis"> + <em><xsl:apply-templates /></em> +</xsl:template> + +</xsl:stylesheet> + +<!-- + <xsl:message> + <xsl:value-of select="$chunk.name" /> +</xsl:message> +--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/VERSION new/yast2-slide-show-3.1.3/VERSION --- old/yast2-slide-show-3.1.0/VERSION 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/package/yast2-slide-show.changes new/yast2-slide-show-3.1.3/package/yast2-slide-show.changes --- old/yast2-slide-show-3.1.0/package/yast2-slide-show.changes 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/package/yast2-slide-show.changes 2014-04-15 15:52:37.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Tue Apr 15 13:39:29 UTC 2014 - ke@suse.de + +- Add more SLES images. +- Use SLES contents for SLED, too. + +------------------------------------------------------------------- +Tue Apr 15 09:13:27 UTC 2014 - ke@suse.de + +- Add SLES test images. +- 3.1.2 + +------------------------------------------------------------------- +Mon Apr 14 14:20:32 UTC 2014 - ke@suse.de + +- Enable SLES; use contents provided by mge. +- 3.1.1 + +------------------------------------------------------------------- Thu Sep 19 16:47:05 UTC 2013 - lslezak@suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/package/yast2-slide-show.spec new/yast2-slide-show-3.1.3/package/yast2-slide-show.spec --- old/yast2-slide-show-3.1.0/package/yast2-slide-show.spec 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/package/yast2-slide-show.spec 2014-04-15 15:52:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slide-show -Version: 3.1.0 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,12 +25,13 @@ # xml2po uses temporary files that do not like being called twice +# xml2po probably is not thread-safe. %define jobs 1 BuildRequires: docbook_4 BuildRequires: gnome-doc-utils BuildRequires: pkgconfig BuildRequires: sgml-skel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 %if 0%{?suse_version} > 1120 # was in gnome-doc-utils before BuildRequires: xml2po @@ -43,28 +44,28 @@ Source12: slideshow-sled-po.tar.gz %description -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SuSELinux -Summary: YaST2 - Slide Show (openSUSE) +Summary: YaST - Slide Show (openSUSE) Group: Metapackages %description SuSELinux -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLES -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Server) +Summary: YaST - Slide Show (SUSE Linux Enterprise Server) Group: Metapackages %description SLES -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLED -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Desktop) +Summary: YaST - Slide Show (SUSE Linux Enterprise Desktop) Group: Metapackages %description SLED -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %prep %setup -n %{name}-%{version} @@ -78,6 +79,12 @@ tar xf %{S:12} langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am +popd + +pushd SLES +tar xf %{S:12} +langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) +sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am popd %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org