Author: lslezak Date: Fri Dec 5 15:02:44 2008 New Revision: 53940 URL: http://svn.opensuse.org/viewcvs/yast?rev=53940&view=rev Log: - use control.rng file for validating the dirinstall control file (bnc#455994) - 2.17.3 Modified: trunk/dirinstall/VERSION trunk/dirinstall/package/yast2-dirinstall.changes trunk/dirinstall/src/config/Makefile.am trunk/dirinstall/src/config/dirinstall.xml trunk/dirinstall/yast2-dirinstall.spec.in Modified: trunk/dirinstall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/VERSION?rev=53940&r1=53939&r2=53940&view=diff ============================================================================== --- trunk/dirinstall/VERSION (original) +++ trunk/dirinstall/VERSION Fri Dec 5 15:02:44 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/dirinstall/package/yast2-dirinstall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/package/yast2-dirinstall.changes?rev=53940&r1=53939&r2=53940&view=diff ============================================================================== --- trunk/dirinstall/package/yast2-dirinstall.changes (original) +++ trunk/dirinstall/package/yast2-dirinstall.changes Fri Dec 5 15:02:44 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 5 14:40:20 CET 2008 - lslezak@suse.cz + +- use control.rng file for validating the dirinstall control file + (bnc#455994) +- 2.17.3 + +------------------------------------------------------------------- Mon Nov 24 16:54:15 CET 2008 - locilka@suse.cz - Fixed control file textdomain (bnc #446123). Modified: trunk/dirinstall/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/config/Makefile.am?rev=53940&r1=53939&r2=53940&view=diff ============================================================================== --- trunk/dirinstall/src/config/Makefile.am (original) +++ trunk/dirinstall/src/config/Makefile.am Fri Dec 5 15:02:44 2008 @@ -7,3 +7,7 @@ desktop_DATA = $(wildcard *.desktop) EXTRA_DIST = $(desktop_DATA) $(control_DATA) + +# validate the control file in 'make check' run +check-local: + xmllint --relaxng $(controldir)/control.rng --noout $(control_DATA) Modified: trunk/dirinstall/src/config/dirinstall.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/config/dirinstall.xml?rev=53940&r1=53939&r2=53940&view=diff ============================================================================== --- trunk/dirinstall/src/config/dirinstall.xml (original) +++ trunk/dirinstall/src/config/dirinstall.xml Fri Dec 5 15:02:44 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> -<!DOCTYPE productDefines SYSTEM "/usr/share/YaST2/control/control.dtd"> +<!-- Use /usr/share/YaST2/control/control.rng file for validation --> +<!-- Command: 'xmllint -noout -relaxng /usr/share/YaST2/control/control.rng dirinstall.xml' --> <productDefines xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> Modified: trunk/dirinstall/yast2-dirinstall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/yast2-dirinstall.spec.in?rev=53940&r1=53939&r2=53940&view=diff ============================================================================== --- trunk/dirinstall/yast2-dirinstall.spec.in (original) +++ trunk/dirinstall/yast2-dirinstall.spec.in Fri Dec 5 15:02:44 2008 @@ -11,7 +11,10 @@ BuildRequires: yast2 >= 2.16.7 BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite -#BuildRequires: docbook-xsl-stylesheets doxygen libxslt sgml-skel +# xmllint - for dirinstall.xml validation +BuildRequires: libxml2 +# control.rng - validation schema +BuildRequires: yast2-installation >= 2.17.44 Provides: /usr/share/YaST2/clients/dirinstall.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org