October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66231 - in /trunk/devtools: devtools/bin/create-spec package/yast2-devtools.changes yast2-devtools.spec.in
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 15:14:17 2011 New Revision: 66231 URL: http://svn.opensuse.org/viewcvs/yast?rev=66231&view=rev Log: drop Prefix: thingy Modified: trunk/devtools/devtools/bin/create-spec trunk/devtools/package/yast2-devtools.changes trunk/devtools/yast2-devtools.spec.in Modified: trunk/devtools/devtools/bin/create-spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/create-spe… ============================================================================== --- trunk/devtools/devtools/bin/create-spec (original) +++ trunk/devtools/devtools/bin/create-spec Tue Oct 4 15:14:17 2011 @@ -128,7 +128,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: $RPMNAME-%{version}.tar.bz2 -Prefix: /usr $provides_locale", "\@HEADER-DEVEL\@" => @@ -151,30 +150,30 @@ "\@BUILD\@" => "$DEFAULTBUILDTAG -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" export CXXFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" \%{?suse_update_config:\%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1", "\@BUILD-QT\@" => "$DEFAULTBUILDTAG -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" export CXXFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" \%{?suse_update_config:\%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/%{_lib} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/%{_lib} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1", @@ -183,7 +182,7 @@ "$DEFAULTBUILDTAG autoreconf --force --install \%{?suse_update_config:\%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} +./configure --libdir=%{_libdir} --prefix=%{_prefix} make %{?jobs:-j%jobs}", ##### INSTALL ##### @@ -191,7 +190,7 @@ "\@INSTALL\@" => "\%install make install DESTDIR=\"\$RPM_BUILD_ROOT\" -[ -e \"%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK\" ] || Y2DIR=\"\$RPM_BUILD_ROOT$yast2dir\" make check DESTDIR=\"\$RPM_BUILD_ROOT\" +[ -e \"%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK\" ] || Y2DIR=\"\$RPM_BUILD_ROOT$yast2dir\" make check DESTDIR=\"\$RPM_BUILD_ROOT\" for f in `find \$RPM_BUILD_ROOT/\@desktopdir\@/ -name \"*.desktop\"` ; do d=\${f##*/} \%suse_update_desktop_file -d ycc_\${d\%.desktop} \${d\%.desktop} @@ -218,20 +217,20 @@ # and use it here. (cannot use configure directly because # makefile has ${prefix} and spec file has %{prefix} # FIXME: $prefix unfunctional - #"\@yast2dir@" => "\\\${prefix}/share/YaST2", + #"\@yast2dir@" => "\\\${_prefix}/share/YaST2", "\@pkgconfigdir\@" => "%{_libdir}/pkgconfig", - "\@pkgconfigdatadir\@" => "%{prefix}/share/pkgconfig", + "\@pkgconfigdatadir\@" => "%{_prefix}/share/pkgconfig", - "\@ybindir\@" => "%{prefix}/lib/YaST2/bin", - "\@ystartupdir\@" => "%{prefix}/lib/YaST2", + "\@ybindir\@" => "%{_prefix}/lib/YaST2/bin", + "\@ystartupdir\@" => "%{_prefix}/lib/YaST2", "\@plugindir\@" => "%{_libdir}/YaST2/plugin", - "\@includedir\@" => "%{prefix}/include/YaST2", - "\@docdir\@" => "%{prefix}/share/doc/packages/$RPMNAME", + "\@includedir\@" => "%{_prefix}/include/YaST2", + "\@docdir\@" => "%{_prefix}/share/doc/packages/$RPMNAME", "\@logdir\@" => "/var/log/YaST2", "\@vardir\@" => "/var/lib/YaST2", "\@mandir\@" => "%{_mandir}", - "\@execcompdir\@" => "%{prefix}/lib/YaST2", + "\@execcompdir\@" => "%{_prefix}/lib/YaST2", "\@agentdir\@" => "${execcompdir}/servers_non_y2", "\@ydatadir\@" => "${yast2dir}/data", @@ -243,7 +242,7 @@ "\@yncludedir\@" => "${yast2dir}/include", "\@schemadir\@" => "${yast2dir}/schema", "\@scrconfdir\@" => "${yast2dir}/scrconf", - "\@desktopdir\@" => "%{prefix}/share/applications/YaST2", + "\@desktopdir\@" => "%{_prefix}/share/applications/YaST2", '@fillupdir@' => '/var/adm/fillup-templates', "\@LL\@" => "$LL", Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Tue Oct 4 15:14:17 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 4 15:12:21 CEST 2011 - visnov(a)suse.cz + +- remove definition of Prefix in spec file (create-spec) +- use _prefix in .spec file +- 2.21.5 + +------------------------------------------------------------------- Fri Sep 30 12:26:20 CEST 2011 - visnov(a)suse.cz - added 'y2tool obssync' Modified: trunk/devtools/yast2-devtools.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2-devtools.spec.in?… ============================================================================== --- trunk/devtools/yast2-devtools.spec.in (original) +++ trunk/devtools/yast2-devtools.spec.in Tue Oct 4 15:14:17 2011 @@ -36,7 +36,7 @@ autoreconf --force --install %{?suse_update_config:%{suse_update_config -f}} -./configure --prefix=%{prefix} --libdir=%{_libdir} +./configure --prefix=%{_prefix} --libdir=%{_libdir} make @INSTALL@ @@ -59,23 +59,23 @@ %files %defattr(-,root,root) -%{prefix}/bin/y2tool -%{prefix}/bin/yastdoc -%dir %{prefix}/share/emacs -%dir %{prefix}/share/emacs/site-lisp -%{prefix}/share/emacs/site-lisp/*ycp-mode.el -%dir %{prefix}/share/vim -%dir %{prefix}/share/vim/site -%dir %{prefix}/share/vim/site/syntax -%{prefix}/share/vim/site/syntax/ycp.vim -%dir %{prefix}/share/vim/site/ftdetect -%{prefix}/share/vim/site/ftdetect/ycp_filetype.vim -%dir %{prefix}/lib/YaST2 -%{prefix}/share/cmake +%{_prefix}/bin/y2tool +%{_prefix}/bin/yastdoc +%dir %{_prefix}/share/emacs +%dir %{_prefix}/share/emacs/site-lisp +%{_prefix}/share/emacs/site-lisp/*ycp-mode.el +%dir %{_prefix}/share/vim +%dir %{_prefix}/share/vim/site +%dir %{_prefix}/share/vim/site/syntax +%{_prefix}/share/vim/site/syntax/ycp.vim +%dir %{_prefix}/share/vim/site/ftdetect +%{_prefix}/share/vim/site/ftdetect/ycp_filetype.vim +%dir %{_prefix}/lib/YaST2 +%{_prefix}/share/cmake @ybindir@ -%dir %{prefix}/share/YaST2 +%dir %{_prefix}/share/YaST2 @ydatadir@ -%{prefix}/share/aclocal/*.m4 +%{_prefix}/share/aclocal/*.m4 @pkgconfigdatadir@/@RPMNAME@.pc %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66230 - in /trunk: add-on-creator/ add-on/ apparmor/ autofs/ backup/ boot-server/ core/ country/ dbus-client/ dbus-server/ devtools/ dhcp-server/ dirinstall/ dns-server/ fingerprint-reader/ firewa...
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 14:11:48 2011 New Revision: 66230 URL: http://svn.opensuse.org/viewcvs/yast?rev=66230&view=rev Log: license in SPDX format Modified: trunk/add-on-creator/yast2-add-on-creator.spec.in trunk/add-on/yast2-add-on.spec.in trunk/apparmor/yast2-apparmor.spec.in trunk/autofs/yast2-autofs.spec.in trunk/backup/yast2-backup.spec.in trunk/boot-server/yast2-boot-server.spec.in trunk/core/yast2-core.spec.in trunk/country/yast2-country.spec.in trunk/dbus-client/yast2-dbus-client.spec.in trunk/dbus-server/yast2-dbus-server.spec.in trunk/devtools/yast2-devtools.spec.in trunk/dhcp-server/yast2-dhcp-server.spec.in trunk/dirinstall/yast2-dirinstall.spec.in trunk/dns-server/yast2-dns-server.spec.in trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in trunk/firewall/yast2-firewall.spec.in trunk/firstboot/yast2-firstboot.spec.in trunk/ftp-server/yast2-ftp-server.spec.in trunk/hardware-detection/yast2-hardware-detection.spec.in trunk/heartbeat/yast2-heartbeat.spec.in trunk/http-server/yast2-http-server.spec.in trunk/inetd/yast2-inetd.spec.in trunk/installation/yast2-installation.spec.in trunk/instserver/yast2-instserver.spec.in trunk/iscsi-client/yast2-iscsi-client.spec.in trunk/iscsi-server/yast2-iscsi-server.spec.in trunk/kdump/yast2-kdump.spec.in trunk/kerberos-client/yast2-kerberos-client.spec.in trunk/ldap-client/yast2-ldap-client.spec.in trunk/ldap-server/yast2-ldap-server.spec.in trunk/ldap/yast2-ldap.spec.in trunk/live-installer/yast2-live-installer.spec.in trunk/metapackage/yast2-metapackage-handler.spec.in trunk/mouse/yast2-mouse.spec.in trunk/multipath/yast2-multipath.spec.in trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in trunk/ncurses/yast2-ncurses.spec.in trunk/network/yast2-network.spec.in trunk/nfs-server/yast2-nfs-server.spec.in trunk/nis-client/yast2-nis-client.spec.in trunk/nis-server/yast2-nis-server.spec.in trunk/ntp-client/yast2-ntp-client.spec.in trunk/online-update-configuration/yast2-online-update-configuration.spec.in trunk/online-update/yast2-online-update.spec.in trunk/packager/yast2-packager.spec.in trunk/pam/yast2-pam.spec.in trunk/perl-bindings/yast2-perl-bindings.spec.in trunk/phone-services/yast2-phone-services.spec.in trunk/pkg-bindings/yast2-pkg-bindings.spec.in trunk/power-management/yast2-power-management.spec.in trunk/product-creator/yast2-product-creator.spec.in trunk/profile-manager/yast2-profile-manager.spec.in trunk/python-bindings/yast2-python-bindings.spec.in trunk/qt-graph/yast2-qt-graph.spec.in trunk/qt-pkg/yast2-qt-pkg.spec.in trunk/qt/yast2-qt.spec.in trunk/registration/yast2-registration.spec.in trunk/reipl/yast2-reipl.spec.in trunk/runlevel/yast2-runlevel.spec.in trunk/samba-client/yast2-samba-client.spec.in trunk/samba-server/yast2-samba-server.spec.in trunk/schema/yast2-schema.spec.in trunk/security/yast2-security.spec.in trunk/slide-show/yast2-slide-show.spec.in trunk/slp-server/yast2-slp-server.spec.in trunk/snapper/yast2-snapper.spec.in trunk/sound/yast2-sound.spec.in trunk/squid/yast2-squid.spec.in trunk/sshd/yast2-sshd.spec.in trunk/storage/yast2-storage.spec.in trunk/sudo/yast2-sudo.spec.in trunk/support/yast2-support.spec.in trunk/sysconfig/yast2-sysconfig.spec.in trunk/system-profile/yast2-system-profile.spec.in trunk/testsuite/yast2-testsuite.spec.in trunk/tftp-server/yast2-tftp-server.spec.in trunk/theme/yast2-theme.spec.in trunk/transfer/yast2-transfer.spec.in trunk/tune/yast2-tune.spec.in trunk/tv/yast2-tv.spec.in trunk/update/yast2-update.spec.in trunk/users/yast2-users.spec.in trunk/wagon/yast2-wagon.spec.in trunk/x11/yast2-x11.spec.in trunk/xml/yast2-xml.spec.in trunk/yast2/yast2.spec.in trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Modified: trunk/add-on-creator/yast2-add-on-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/yast2-add-on-crea… ============================================================================== --- trunk/add-on-creator/yast2-add-on-creator.spec.in (original) +++ trunk/add-on-creator/yast2-add-on-creator.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 only GPL v2 or later +License: GPL-2.0 GPL-2.0+ PreReq: %fillup_prereq Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=… ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: autoyast2-installation # PackagesUI module, BNC #469320 # Wizard::SetDesktopTitleAndIcon Modified: trunk/apparmor/yast2-apparmor.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/yast2-apparmor.spec.in?… ============================================================================== --- trunk/apparmor/yast2-apparmor.spec.in (original) +++ trunk/apparmor/yast2-apparmor.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: Productivity/Security -License: GPL v2 or later +License: GPL-2.0+ Summary: YaST2 - Plugins for AppArmor Profile Management Requires: yast2 perl-TimeDate @@ -47,7 +47,7 @@ /usr/lib/YaST2/servers_non_y2 %dir %{perl_vendorlib}/Immunix %{perl_vendorlib}/Immunix/Notify.pm -# license is questionable, PDB says GPL v2 or later +# license is questionable, PDB says GPL-2.0+ #%doc COPYING.LGPL %dir %attr(-,root,root) /etc/apparmor %config(noreplace) /etc/apparmor/reports.crontab Modified: trunk/autofs/yast2-autofs.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/yast2-autofs.spec.in?rev=… ============================================================================== --- trunk/autofs/yast2-autofs.spec.in (original) +++ trunk/autofs/yast2-autofs.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Modified: trunk/backup/yast2-backup.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/yast2-backup.spec.in?rev=… ============================================================================== --- trunk/backup/yast2-backup.spec.in (original) +++ trunk/backup/yast2-backup.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Summary: YaST2 - System Backup BuildArchitectures: noarch Modified: trunk/boot-server/yast2-boot-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/boot-server/yast2-boot-server.sp… ============================================================================== --- trunk/boot-server/yast2-boot-server.spec.in (original) +++ trunk/boot-server/yast2-boot-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=6623… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # obviously BuildRequires: gcc-c++ boost-devel # we have a parser Modified: trunk/country/yast2-country.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?re… ============================================================================== --- trunk/country/yast2-country.spec.in (original) +++ trunk/country/yast2-country.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy Modified: trunk/dbus-client/yast2-dbus-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-client/yast2-dbus-client.sp… ============================================================================== --- trunk/dbus-client/yast2-dbus-client.spec.in (original) +++ trunk/dbus-client/yast2-dbus-client.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # obviously BuildRequires: gcc-c++ # needed for all yast packages Modified: trunk/dbus-server/yast2-dbus-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-server/yast2-dbus-server.sp… ============================================================================== --- trunk/dbus-server/yast2-dbus-server.spec.in (original) +++ trunk/dbus-server/yast2-dbus-server.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Url: http://en.opensuse.org/Portal:YaST # obviously BuildRequires: gcc-c++ Modified: trunk/devtools/yast2-devtools.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2-devtools.spec.in?… ============================================================================== --- trunk/devtools/yast2-devtools.spec.in (original) +++ trunk/devtools/yast2-devtools.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel Requires: perl Requires: perl-XML-Writer Modified: trunk/dhcp-server/yast2-dhcp-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/yast2-dhcp-server.sp… ============================================================================== --- trunk/dhcp-server/yast2-dhcp-server.spec.in (original) +++ trunk/dhcp-server/yast2-dhcp-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite yast2-dns-server Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent Modified: trunk/dirinstall/yast2-dirinstall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/yast2-dirinstall.spec… ============================================================================== --- trunk/dirinstall/yast2-dirinstall.spec.in (original) +++ trunk/dirinstall/yast2-dirinstall.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Installation::dirinstall_target # Wizard::SetDesktopTitleAndIcon Modified: trunk/dns-server/yast2-dns-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/yast2-dns-server.spec… ============================================================================== --- trunk/dns-server/yast2-dns-server.spec.in (original) +++ trunk/dns-server/yast2-dns-server.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: yast2-ldap-client perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-perl-bindings # requires DnsServerAPI::GetReverseIPforIPv6 Modified: trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/yast2-fingerp… ============================================================================== --- trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in (original) +++ trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2-pam Requires: yast2 >= 2.21.22 BuildRequires: libfprint0 libfprint-devel libusb-devel Modified: trunk/firewall/yast2-firewall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/yast2-firewall.spec.in?… ============================================================================== --- trunk/firewall/yast2-firewall.spec.in (original) +++ trunk/firewall/yast2-firewall.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.16.47 Modified: trunk/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/yast2-firstboot.spec.i… ============================================================================== --- trunk/firstboot/yast2-firstboot.spec.in (original) +++ trunk/firstboot/yast2-firstboot.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later X11/MIT +License: GPL-2.0+ X11/MIT BuildRequires: yast2-xml update-desktop-files yast2-devtools yast2-testsuite docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files # Internet.ycp moved to yast2.rpm BuildRequires: yast2 >= 2.16.6 Modified: trunk/ftp-server/yast2-ftp-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/yast2-ftp-server.spec… ============================================================================== --- trunk/ftp-server/yast2-ftp-server.spec.in (original) +++ trunk/ftp-server/yast2-ftp-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Requires: yast2-inetd Modified: trunk/hardware-detection/yast2-hardware-detection.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/yast2-hardwar… ============================================================================== --- trunk/hardware-detection/yast2-hardware-detection.spec.in (original) +++ trunk/hardware-detection/yast2-hardware-detection.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # obviously BuildRequires: gcc-c++ # needed for all yast packages Modified: trunk/heartbeat/yast2-heartbeat.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/yast2-heartbeat.spec.i… ============================================================================== --- trunk/heartbeat/yast2-heartbeat.spec.in (original) +++ trunk/heartbeat/yast2-heartbeat.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 >= 2.21.22 Modified: trunk/http-server/yast2-http-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/yast2-http-server.sp… ============================================================================== --- trunk/http-server/yast2-http-server.spec.in (original) +++ trunk/http-server/yast2-http-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) Modified: trunk/inetd/yast2-inetd.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/yast2-inetd.spec.in?rev=66… ============================================================================== --- trunk/inetd/yast2-inetd.spec.in (original) +++ trunk/inetd/yast2-inetd.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: yast2-users perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # Wizard::SetDialogTitleAndIcon Requires: yast2 >= 2.21.22 Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service Modified: trunk/instserver/yast2-instserver.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/yast2-instserver.spec… ============================================================================== --- trunk/instserver/yast2-instserver.spec.in (original) +++ trunk/instserver/yast2-instserver.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ # @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-slp # ag_content agent Modified: trunk/iscsi-client/yast2-iscsi-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/yast2-iscsi-client.… ============================================================================== --- trunk/iscsi-client/yast2-iscsi-client.spec.in (original) +++ trunk/iscsi-client/yast2-iscsi-client.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager Requires: yast2-packager Modified: trunk/iscsi-server/yast2-iscsi-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/yast2-iscsi-server.… ============================================================================== --- trunk/iscsi-server/yast2-iscsi-server.spec.in (original) +++ trunk/iscsi-server/yast2-iscsi-server.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite # network needs Wizard::OpenCancelOKDialog() Modified: trunk/kdump/yast2-kdump.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/yast2-kdump.spec.in?rev=66… ============================================================================== --- trunk/kdump/yast2-kdump.spec.in (original) +++ trunk/kdump/yast2-kdump.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 only +License: GPL-2.0 Requires: yast2 yast2-storage yast2-bootloader BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-storage yast2-bootloader Modified: trunk/kerberos-client/yast2-kerberos-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/yast2-kerberos-c… ============================================================================== --- trunk/kerberos-client/yast2-kerberos-client.spec.in (original) +++ trunk/kerberos-client/yast2-kerberos-client.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite # etc_krb5_conf.scr Modified: trunk/ldap-client/yast2-ldap-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/yast2-ldap-client.sp… ============================================================================== --- trunk/ldap-client/yast2-ldap-client.spec.in (original) +++ trunk/ldap-client/yast2-ldap-client.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite yast2-network PreReq: %fillup_prereq Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later X11/MIT +License: GPL-2.0+ X11/MIT BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-gettext perl-X500-DN pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users Modified: trunk/ldap/yast2-ldap.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/yast2-ldap.spec.in?rev=6623… ============================================================================== --- trunk/ldap/yast2-ldap.spec.in (original) +++ trunk/ldap/yast2-ldap.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ libldapcpp-devel libxcrypt-devel yast2-devtools doxygen yast2-core-devel yast2 Summary: YaST2 - LDAP Agent Requires: ldapcpplib yast2 Modified: trunk/live-installer/yast2-live-installer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/yast2-live-instal… ============================================================================== --- trunk/live-installer/yast2-live-installer.spec.in (original) +++ trunk/live-installer/yast2-live-installer.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Internet and InternetDevices Requires: yast2 >= 2.16.6 Modified: trunk/metapackage/yast2-metapackage-handler.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/yast2-metapackage-ha… ============================================================================== --- trunk/metapackage/yast2-metapackage-handler.spec.in (original) +++ trunk/metapackage/yast2-metapackage-handler.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # should be required by devtools BuildRequires: pkgconfig perl-XML-Writer Modified: trunk/mouse/yast2-mouse.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/yast2-mouse.spec.in?rev=66… ============================================================================== --- trunk/mouse/yast2-mouse.spec.in (original) +++ trunk/mouse/yast2-mouse.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # AutoinstData # Wizard::SetDesktopTitleAndIcon Modified: trunk/multipath/yast2-multipath.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/yast2-multipath.spec.i… ============================================================================== --- trunk/multipath/yast2-multipath.spec.in (original) +++ trunk/multipath/yast2-multipath.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2 yast2-python-bindings BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildRequires: yast2-storage Modified: trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/yast2-ncurses-pkg.sp… ============================================================================== --- trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in (original) +++ trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel yast2-ncurses-devel Modified: trunk/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/yast2-ncurses.spec.in?re… ============================================================================== --- trunk/ncurses/yast2-ncurses.spec.in (original) +++ trunk/ncurses/yast2-ncurses.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen dejagnu gcc-c++ yast2-devtools BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files Modified: trunk/nfs-server/yast2-nfs-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/yast2-nfs-server.spec… ============================================================================== --- trunk/nfs-server/yast2-nfs-server.spec.in (original) +++ trunk/nfs-server/yast2-nfs-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # Service::Find # Wizard::SetDesktopTitleAndIcon Modified: trunk/nis-client/yast2-nis-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/yast2-nis-client.spec… ============================================================================== --- trunk/nis-client/yast2-nis-client.spec.in (original) +++ trunk/nis-client/yast2-nis-client.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ perl-XML-Writer doxygen yast2-devtools yast2-core-devel yast2 yast2-testsuite yast2-pam update-desktop-files # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Modified: trunk/nis-server/yast2-nis-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/yast2-nis-server.spec… ============================================================================== --- trunk/nis-server/yast2-nis-server.spec.in (original) +++ trunk/nis-server/yast2-nis-server.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-nis-client yast2-testsuite Requires: yast2-network yast2-nis-client Modified: trunk/ntp-client/yast2-ntp-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/yast2-ntp-client.spec… ============================================================================== --- trunk/ntp-client/yast2-ntp-client.spec.in (original) +++ trunk/ntp-client/yast2-ntp-client.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildRequires: yast2-country-data #SLPAPI.pm Modified: trunk/online-update-configuration/yast2-online-update-configuration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/yast… ============================================================================== --- trunk/online-update-configuration/yast2-online-update-configuration.spec.in (original) +++ trunk/online-update-configuration/yast2-online-update-configuration.spec.in Tue Oct 4 14:11:48 2011 @@ -19,7 +19,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.0 Requires: yast2-packager >= 2.17.0 Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-updat… ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ update-desktop-files yast2-devtools yast2-packager # changed StartPackage callback signature Requires: yast2-pkg-bindings >= 2.20.3 Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp # HTTP.ycp Modified: trunk/pam/yast2-pam.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/yast2-pam.spec.in?rev=66230&… ============================================================================== --- trunk/pam/yast2-pam.spec.in (original) +++ trunk/pam/yast2-pam.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: yast2-devtools doxygen yast2-core-devel perl-XML-Writer yast2 yast2-testsuite Requires: yast2 Modified: trunk/perl-bindings/yast2-perl-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/yast2-perl-binding… ============================================================================== --- trunk/perl-bindings/yast2-perl-bindings.spec.in (original) +++ trunk/perl-bindings/yast2-perl-bindings.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: blocxx-devel curl-devel gcc-c++ libxcrypt-devel rpm-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings-devel # YCPValue::valuetype_str() Modified: trunk/phone-services/yast2-phone-services.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/yast2-phone-servi… ============================================================================== --- trunk/phone-services/yast2-phone-services.spec.in (original) +++ trunk/phone-services/yast2-phone-services.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen perl-XML-Writer update-desktop-files pkg-config yast2 yast2-devtools yast2-users # Wizard::SetDesktopTitleAndIcon Requires: yast2 > 2.21.22 Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/yast2-pkg-bindings.… ============================================================================== --- trunk/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ trunk/pkg-bindings/yast2-pkg-bindings.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 6.10.0 Modified: trunk/power-management/yast2-power-management.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/yast2-power-man… ============================================================================== --- trunk/power-management/yast2-power-management.spec.in (original) +++ trunk/power-management/yast2-power-management.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: update-desktop-files yast2-devtools yast2-testsuite perl-XML-Writer yast2 Requires: gettext BuildArchitectures: noarch Modified: trunk/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-cr… ============================================================================== --- trunk/product-creator/yast2-product-creator.spec.in (original) +++ trunk/product-creator/yast2-product-creator.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security yast2-add-on-creator yast2 yast2-slp PreReq: %fillup_prereq Modified: trunk/profile-manager/yast2-profile-manager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/yast2-profile-ma… ============================================================================== --- trunk/profile-manager/yast2-profile-manager.spec.in (original) +++ trunk/profile-manager/yast2-profile-manager.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Modified: trunk/python-bindings/yast2-python-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/yast2-python-bin… ============================================================================== --- trunk/python-bindings/yast2-python-bindings.spec.in (original) +++ trunk/python-bindings/yast2-python-bindings.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 only +License: GPL-2.0 BuildRequires: blocxx-devel curl-devel gcc-c++ yast2-core-devel yast2-devtools python-devel libxcrypt-devel yast2-ycp-ui-bindings-devel Modified: trunk/qt-graph/yast2-qt-graph.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/yast2-qt-graph.spec.in?… ============================================================================== --- trunk/qt-graph/yast2-qt-graph.spec.in (original) +++ trunk/qt-graph/yast2-qt-graph.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: cmake libqt4-devel graphviz-devel >= 2.26.0 BuildRequires: yast2-devtools yast2-libyui-devel >= 2.18.7 yast2-qt-devel >= 2.18.6 Requires: yast2-libyui >= 2.18.7 yast2-qt >= 2.18.6 Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0 or later BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel BuildRequires: libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=66230&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.… ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Tue Oct 4 14:11:48 2011 @@ -19,7 +19,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2 >= 2.17.0 Requires: yast2-packager >= 2.17.0 Requires: suseRegister @@ -56,7 +56,7 @@ @CLEAN@ %package branding-SLE -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2-registration Provides: yast2-registration-branding Conflicts: otherproviders(yast2-registration-branding) @@ -68,7 +68,7 @@ source (mirror) automatically. %package branding-openSUSE -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2-registration Provides: yast2-registration-branding Conflicts: otherproviders(yast2-registration-branding) Modified: trunk/reipl/yast2-reipl.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/yast2-reipl.spec.in?rev=66… ============================================================================== --- trunk/reipl/yast2-reipl.spec.in (original) +++ trunk/reipl/yast2-reipl.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 only GPL v2 or later +License: GPL-2.0 GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-storage yast2-bootloader Requires: yast2-storage yast2-bootloader Modified: trunk/runlevel/yast2-runlevel.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/yast2-runlevel.spec.in?… ============================================================================== --- trunk/runlevel/yast2-runlevel.spec.in (original) +++ trunk/runlevel/yast2-runlevel.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # systemd support in Service.ycp Modified: trunk/samba-client/yast2-samba-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/yast2-samba-client.… ============================================================================== --- trunk/samba-client/yast2-samba-client.spec.in (original) +++ trunk/samba-client/yast2-samba-client.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: yast2-pam yast2-devtools yast2-perl-bindings perl-XML-Writer yast2-testsuite update-desktop-files Requires: yast2-kerberos-client perl-XML-LibXML Modified: trunk/samba-server/yast2-samba-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/yast2-samba-server.… ============================================================================== --- trunk/samba-server/yast2-samba-server.spec.in (original) +++ trunk/samba-server/yast2-samba-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN samba-client yast2-samba-client perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-perl-bindings yast2-ldap-client yast2-users Requires: perl-Crypt-SmbHash Modified: trunk/schema/yast2-schema.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/yast2-schema.spec.in?rev=… ============================================================================== --- trunk/schema/yast2-schema.spec.in (original) +++ trunk/schema/yast2-schema.spec.in Tue Oct 4 14:11:48 2011 @@ -4,7 +4,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: java2-devel-packages trang yast2-all-packages # yast2-core omited from some reason in buildservice, adding explicitly Modified: trunk/security/yast2-security.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/yast2-security.spec.in?… ============================================================================== --- trunk/security/yast2-security.spec.in (original) +++ trunk/security/yast2-security.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: doxygen pkg-config perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-testsuite # new Pam.ycp API Modified: trunk/slide-show/yast2-slide-show.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/yast2-slide-show.spec… ============================================================================== --- trunk/slide-show/yast2-slide-show.spec.in (original) +++ trunk/slide-show/yast2-slide-show.spec.in Tue Oct 4 14:11:48 2011 @@ -4,7 +4,7 @@ # xml2po uses temporary files that do not like being called twice %define jobs 1 Group: Metapackages -License: GPL v2 or later +License: GPL-v2.0+ BuildRequires: pkgconfig yast2-devtools gnome-doc-utils docbook_4 sgml-skel %if 0%{?suse_version} > 1120 # was in gnome-doc-utils before Modified: trunk/slp-server/yast2-slp-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/yast2-slp-server.spec… ============================================================================== --- trunk/slp-server/yast2-slp-server.spec.in (original) +++ trunk/slp-server/yast2-slp-server.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite # network needs Wizard::OpenCancelOKDialog() Modified: trunk/snapper/yast2-snapper.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/yast2-snapper.spec.in?re… ============================================================================== --- trunk/snapper/yast2-snapper.spec.in (original) +++ trunk/snapper/yast2-snapper.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Requires: yast2 >= 2.21.22 -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: update-desktop-files yast2 yast2-devtools yast2-testsuite libsnapper-devel doxygen yast2-core-devel gcc-c++ perl-XML-Writer Summary: YaST - file system snapshots review Modified: trunk/sound/yast2-sound.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/yast2-sound.spec.in?rev=66… ============================================================================== --- trunk/sound/yast2-sound.spec.in (original) +++ trunk/sound/yast2-sound.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: alsa-devel gcc-c++ doxygen perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite kernel-default ruby # GetInstArgs::automatic_configuration Modified: trunk/squid/yast2-squid.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=66… ============================================================================== --- trunk/squid/yast2-squid.spec.in (original) +++ trunk/squid/yast2-squid.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 only +License: GPL-2.0 Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools BuildRequires: yast2-testsuite yast2-core-devel boost-devel gcc-c++ Modified: trunk/sshd/yast2-sshd.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/yast2-sshd.spec.in?rev=6623… ============================================================================== --- trunk/sshd/yast2-sshd.spec.in (original) +++ trunk/sshd/yast2-sshd.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files BuildRequires: libstorage-devel >= 2.21.4 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools Modified: trunk/sudo/yast2-sudo.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/yast2-sudo.spec.in?rev=6623… ============================================================================== --- trunk/sudo/yast2-sudo.spec.in (original) +++ trunk/sudo/yast2-sudo.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2-users # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Modified: trunk/support/yast2-support.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/yast2-support.spec.in?re… ============================================================================== --- trunk/support/yast2-support.spec.in (original) +++ trunk/support/yast2-support.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Modified: trunk/sysconfig/yast2-sysconfig.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/yast2-sysconfig.spec.i… ============================================================================== --- trunk/sysconfig/yast2-sysconfig.spec.in (original) +++ trunk/sysconfig/yast2-sysconfig.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 perl Requires: yast2 >= 2.21.22 Modified: trunk/system-profile/yast2-system-profile.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/yast2-system-prof… ============================================================================== --- trunk/system-profile/yast2-system-profile.spec.in (original) +++ trunk/system-profile/yast2-system-profile.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Modified: trunk/testsuite/yast2-testsuite.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/yast2-testsuite.spec.i… ============================================================================== --- trunk/testsuite/yast2-testsuite.spec.in (original) +++ trunk/testsuite/yast2-testsuite.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings Requires: expect dejagnu # y2base -I includepath -M modulepath Modified: trunk/tftp-server/yast2-tftp-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/yast2-tftp-server.sp… ============================================================================== --- trunk/tftp-server/yast2-tftp-server.spec.in (original) +++ trunk/tftp-server/yast2-tftp-server.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Modified: trunk/theme/yast2-theme.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/yast2-theme.spec.in?rev=66… ============================================================================== --- trunk/theme/yast2-theme.spec.in (original) +++ trunk/theme/yast2-theme.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: yast2-devtools pkg-config update-desktop-files hicolor-icon-theme fdupes BuildArchitectures: noarch Summary: YaST2 - Theme Modified: trunk/transfer/yast2-transfer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/yast2-transfer.spec.in?… ============================================================================== --- trunk/transfer/yast2-transfer.spec.in (original) +++ trunk/transfer/yast2-transfer.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: curl-devel gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite doxygen yast2-core-devel Summary: YaST2 - Agent for Various Transfer Protocols Provides: yast2-agent-curl yast2-agent-tftp yast2-agent-curl-devel yast2-agent-tftp-devel Modified: trunk/tune/yast2-tune.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/yast2-tune.spec.in?rev=6623… ============================================================================== --- trunk/tune/yast2-tune.spec.in (original) +++ trunk/tune/yast2-tune.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-bootloader # hwinfo/classnames.ycp # Wizard::SetDesktopTitleAndIcon Modified: trunk/tv/yast2-tv.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/yast2-tv.spec.in?rev=66230&r1… ============================================================================== --- trunk/tv/yast2-tv.spec.in (original) +++ trunk/tv/yast2-tv.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-sound yast2-testsuite # .modprobe_blacklist agent Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files # FileSystems::possible_root_fs BuildRequires: yast2-storage >= 2.19.12 Modified: trunk/users/yast2-users.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/yast2-users.spec.in?rev=66… ============================================================================== --- trunk/users/yast2-users.spec.in (original) +++ trunk/users/yast2-users.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite yast2-core-devel Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=66… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 @@ -85,7 +85,7 @@ Provides: wagon-control-file Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Conflicts: otherproviders(wagon-control-file) Supplements: packageand(yast2-wagon:branding-openSUSE) @@ -116,7 +116,7 @@ Provides: wagon-control-file Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # Prevent from crashes (BNC #551613) Requires: yast2-registration >= 2.18.0 Modified: trunk/x11/yast2-x11.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/yast2-x11.spec.in?rev=66230&… ============================================================================== --- trunk/x11/yast2-x11.spec.in (original) +++ trunk/x11/yast2-x11.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite #%ifnarch s390 s390x #BuildRequires: sax2 sax2-libsax-perl Modified: trunk/xml/yast2-xml.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/xml/yast2-xml.spec.in?rev=66230&… ============================================================================== --- trunk/xml/yast2-xml.spec.in (original) +++ trunk/xml/yast2-xml.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ yast2-devtools doxygen yast2-core-devel libxml2-devel Summary: YaST2 - XML Agent Requires: yast2-core Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=66230&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Tue Oct 4 14:11:48 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-perl-bindings Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bin… ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Tue Oct 4 14:11:48 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-v2.0+ BuildRequires: gcc-c++ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66229 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: gs Date: Tue Oct 4 13:27:33 2011 New Revision: 66229 URL: http://svn.opensuse.org/viewcvs/yast?rev=66229&view=rev Log: set create_ifcfg to false if file already exists Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Tue Oct 4 13:27:33 2011 @@ -316,8 +316,8 @@ // create and start FCoE command = sformat( "fipvlan -c -s %1", dev_name ); - // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists - // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) + // if /etc/sysconfig/network/ifcfg-<if>.<vlan> already exists + // call 'ifup' for the interface (creates /proc/net/vlan/<if>.<vlan>) if ( FileUtils::Exists( FcoeClient::ifcfg_file ) ) { string cmd_ifup = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); @@ -325,6 +325,8 @@ output = (map)SCR::Execute( .target.bash_output, cmd_ifup ); y2milestone( "Output: %1", output ); + create_ifcfg = false; // /etc/sysconfig/network/ifcfg-file already exists + if ( output["exit"]:255 == 0 ) { // only start FCoE -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66228 - /tags/stable-2_21_1/audit-laf/
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:52:12 2011 New Revision: 66228 URL: http://svn.opensuse.org/viewcvs/yast?rev=66228&view=rev Log: Created tag stable-2_21_1 for audit-laf Added: tags/stable-2_21_1/audit-laf/ - copied from r66227, trunk/audit-laf/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66227 - /tags/stable-2_21_1/audit-laf/
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:52:07 2011 New Revision: 66227 URL: http://svn.opensuse.org/viewcvs/yast?rev=66227&view=rev Log: Removed tag stable-2_21_1 for audit-laf Removed: tags/stable-2_21_1/audit-laf/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66226 - in /trunk/audit-laf: package/yast2-audit-laf.changes yast2-audit-laf.spec.in
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:52:00 2011 New Revision: 66226 URL: http://svn.opensuse.org/viewcvs/yast?rev=66226&view=rev Log: license fix and SPDX format (thanks to Ciaran Farrell) Modified: trunk/audit-laf/package/yast2-audit-laf.changes trunk/audit-laf/yast2-audit-laf.spec.in Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Tue Oct 4 12:52:00 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 4 10:12:29 UTC 2011 - cfarrell(a)suse.com + +- license update: GPL-2.0 + bnc#719219 + +------------------------------------------------------------------- Wed Sep 28 22:38:29 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/audit-laf/yast2-audit-laf.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/yast2-audit-laf.spec.i… ============================================================================== --- trunk/audit-laf/yast2-audit-laf.spec.in (original) +++ trunk/audit-laf/yast2-audit-laf.spec.in Tue Oct 4 12:52:00 2011 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0 # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66225 - /tags/stable-2_21_0/slp/
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:50:18 2011 New Revision: 66225 URL: http://svn.opensuse.org/viewcvs/yast?rev=66225&view=rev Log: Created tag stable-2_21_0 for slp Added: tags/stable-2_21_0/slp/ - copied from r66224, trunk/slp/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66224 - /tags/stable-2_21_0/slp/
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:50:12 2011 New Revision: 66224 URL: http://svn.opensuse.org/viewcvs/yast?rev=66224&view=rev Log: Removed tag stable-2_21_0 for slp Removed: tags/stable-2_21_0/slp/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66223 - /tags/stable-2_21_0/bootloader/
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:49:51 2011 New Revision: 66223 URL: http://svn.opensuse.org/viewcvs/yast?rev=66223&view=rev Log: Created tag stable-2_21_0 for bootloader Added: tags/stable-2_21_0/bootloader/ (props changed) - copied from r66222, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66222 - /tags/stable-2_21_0/bootloader/
by visnov＠svn2.opensuse.org 04 Oct '11

04 Oct '11

Author: visnov Date: Tue Oct 4 12:49:44 2011 New Revision: 66222 URL: http://svn.opensuse.org/viewcvs/yast?rev=66222&view=rev Log: Removed tag stable-2_21_0 for bootloader Removed: tags/stable-2_21_0/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0