removed obsolete BuildRequires

(perl-XML-Writer, sgml-skel, yast2, yast2-installation, yast2-testsuite, yast2-xml)
yast · Sep 13, 2013 · 6caef9a · 6caef9a
1 parent 97f7473
commit 6caef9a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/configure.in.in b/configure.in.in
@@ -6,7 +6,6 @@
 
 ## some common checks
 @YAST2-CHECKS-COMMON@
-@YAST2-CHECKS-YCP@
 
 AX_CHECK_DOCBOOK
 
@@ -15,5 +14,10 @@ AX_CHECK_DOCBOOK
 
 find control -name \*.glade | LC_ALL=C sort > POTFILES
 
+# this module does not have any YCP modules
+# (defined explicitly here as using (@)YAST2-CHECKS-YCP(@) would add yast2-core
+# build dependency back)
+AM_CONDITIONAL([HAS_YCP_MODULES], [false])
+
 ## and generate the output...
 @YAST2-OUTPUT@
diff --git a/package/yast2-firstboot.changes b/package/yast2-firstboot.changes
@@ -3,6 +3,8 @@ Fri Sep 13 11:57:58 UTC 2013 - lslezak@suse.cz
 
 - properly symlink firstboot.xml file (for collecting translatable
   strings by "make pot")
+- removed obsolete BuildRequires (perl-XML-Writer, sgml-skel,
+  yast2, yast2-installation, yast2-testsuite, yast2-xml)
 
 -------------------------------------------------------------------
 Wed Jul 31 08:29:10 UTC 2013 - yast-devel@opensuse.org

diff --git a/yast2-firstboot.spec.in b/yast2-firstboot.spec.in
@@ -4,11 +4,7 @@
 @HEADER@
 Group:          System/YaST
 License:        GPL-2.0
-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
-# Installation startup scripts
-BuildRequires:	yast2-installation
+BuildRequires:	update-desktop-files yast2-devtools docbook-xsl-stylesheets libxslt
 
 # yast2/NeworkDevices -> yast2/NetworkInterfaces
 Requires:	yast2 >= 2.16.23
@@ -52,19 +48,29 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/firstboot/scripts
 
 %files
 %defattr(-,root,root)
+%dir @ystartupdir@/startup
 %dir @ystartupdir@/startup/Firstboot-Stage
 @ystartupdir@/startup/Firstboot-Stage/*
 @ystartupdir@/startup/YaST2.Firstboot
 @clientdir@/firstboot_*.rb
 @clientdir@/firstboot.rb
+%dir @yncludedir@
 %dir @yncludedir@/firstboot
 @yncludedir@/firstboot/*.rb
+%dir @moduledir@
 @moduledir@/Firstboot.*
+%dir @scrconfdir@
 @scrconfdir@/*.scr
 /var/adm/fillup-templates/sysconfig.firstboot
 /usr/share/firstboot
 %doc @docdir@
 %doc COPYING
+%dir /etc/YaST2/
 /etc/YaST2/*.xml
+%dir /usr/share/autoinstall
+%dir /usr/share/autoinstall/modules
 /usr/share/autoinstall/modules/firstboot.desktop
-/usr/share/YaST2/schema/autoyast/rnc/firstboot.rnc
+%dir @schemadir@
+%dir @schemadir@/autoyast
+%dir @schemadir@/autoyast/rnc
+@schemadir@/autoyast/rnc/firstboot.rnc