Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup #4

Merged
merged 4 commits into from
Sep 13, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0
3.0.1
10 changes: 7 additions & 3 deletions configure.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@

## some common checks
@YAST2-CHECKS-COMMON@
@YAST2-CHECKS-YCP@

AX_CHECK_DOCBOOK

## Nasty hack: xgettext doesn't work for XML files, so let's symlink it
( cd src/control; ln -sf firstboot.xml firstboot.glade )
( cd control; ln -sf firstboot.xml firstboot.glade )

find src/control -name \*.glade | LC_ALL=C sort > POTFILES
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@
9 changes: 9 additions & 0 deletions package/yast2-firstboot.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
-------------------------------------------------------------------
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)
- 3.0.1

-------------------------------------------------------------------
Wed Jul 31 08:29:10 UTC 2013 - yast-devel@opensuse.org

Expand Down
21 changes: 0 additions & 21 deletions testsuite/Makefile.am

This file was deleted.

18 changes: 12 additions & 6 deletions yast2-firstboot.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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