commit yast2-add-on for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2013-07-29 17:51:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old)
and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2013-04-03 13:09:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2013-07-29 17:51:49.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Jul 25 15:09:55 UTC 2013 - lslezak@suse.cz
+
+- removed obsolete BuildRequires (yast2-testsuite, yast2-packager,
+ yast2-installation, yast2-storage)
+- move development documentation to devel-doc subpackage
+- 2.24.1
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-2.24.0.tar.bz2
New:
----
yast2-add-on-2.24.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.mi6Gb2/_old 2013-07-29 17:51:50.000000000 +0200
+++ /var/tmp/diff_new_pack.mi6Gb2/_new 2013-07-29 17:51:50.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 2.24.0
+Version: 2.24.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,14 +34,9 @@
# bugzilla #335582, new API for StorageDevices
Requires: yast2-storage >= 2.16.1
-BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 2.23.8
BuildRequires: yast2-devtools
-BuildRequires: yast2-installation
-BuildRequires: yast2-packager
-BuildRequires: yast2-storage
-BuildRequires: yast2-testsuite
# splitted from yast2-installation
Provides: yast2-installation:/usr/share/YaST2/clients/add-on.ycp
@@ -62,6 +57,15 @@
%description
This package contains YaST Add-On media installation code.
+%package devel-doc
+Requires: yast2-add-on = %version
+Summary: YaST2 - Add-on - Development Documentation
+Group: System/YaST
+
+%description devel-doc
+This package contains development documentation for using the API
+provided by yast2-add-on package.
+
%prep
%setup -n yast2-add-on-%{version}
@@ -102,6 +106,11 @@
#/usr/share/YaST2/modules/*.ybc
%{_prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/schema/autoyast/rnc/add-on.rnc
-%doc %{_prefix}/share/doc/packages/yast2-add-on
+%dir %{_prefix}/share/doc/packages/yast2-add-on
+%doc %{_prefix}/share/doc/packages/yast2-add-on/README
+%doc %{_prefix}/share/doc/packages/yast2-add-on/COPYING
+
+%files devel-doc
+%doc %{_prefix}/share/doc/packages/yast2-add-on/autodocs
%changelog
++++++ yast2-add-on-2.24.0.tar.bz2 -> yast2-add-on-2.24.1.tar.bz2 ++++++
++++ 1742 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.24.0/Makefile.am new/yast2-add-on-2.24.1/Makefile.am
--- old/yast2-add-on-2.24.0/Makefile.am 2013-03-26 17:52:37.000000000 +0100
+++ new/yast2-add-on-2.24.1/Makefile.am 2013-07-25 17:36:51.000000000 +0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
@@ -198,4 +193,4 @@
test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents doc src testsuite
+SUBDIRS = doc src
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.24.0/Makefile.am.common new/yast2-add-on-2.24.1/Makefile.am.common
--- old/yast2-add-on-2.24.0/Makefile.am.common 2013-03-26 17:52:37.000000000 +0100
+++ new/yast2-add-on-2.24.1/Makefile.am.common 2013-07-25 17:36:51.000000000 +0200
@@ -31,7 +31,7 @@
CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.24.0/VERSION new/yast2-add-on-2.24.1/VERSION
--- old/yast2-add-on-2.24.0/VERSION 2013-03-26 12:33:06.000000000 +0100
+++ new/yast2-add-on-2.24.1/VERSION 2013-07-25 17:36:44.000000000 +0200
@@ -1 +1 @@
-2.24.0
+2.24.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.24.0/agents/Makefile.am new/yast2-add-on-2.24.1/agents/Makefile.am
--- old/yast2-add-on-2.24.0/agents/Makefile.am 2013-01-22 11:06:35.000000000 +0100
+++ new/yast2-add-on-2.24.1/agents/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-# Makefile.am for add-on/agents
-
-agent_SCRIPTS =
-
-scrconf_DATA =
-
-EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.24.0/autodocs-ycp.ami new/yast2-add-on-2.24.1/autodocs-ycp.ami
--- old/yast2-add-on-2.24.0/autodocs-ycp.ami 2013-03-26 17:52:37.000000000 +0100
+++ new/yast2-add-on-2.24.1/autodocs-ycp.ami 2013-07-25 17:36:51.000000000 +0200
@@ -8,6 +8,8 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard)
+# Optional - the default is $(srcdir)/../../src/modules/*.rb) $(srcdir)/../../src/include/*/*.rb
# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
# Optional - the default is no subdir, $(docdir)/autodocs
# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
@@ -15,18 +17,31 @@
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
-CLEANFILES = $(html_DATA) pod2htm*.tmp
+# use nobase_ prefix to keep the directory structure
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_RB ?= $(wildcard $(srcdir)/../../src/modules/*.rb $(srcdir)/../../src/include/*/*.rb)
AUTODOCS_STRIP ?= $(srcdir)/../../src
-index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+# yard specific options
+YARD ?= yard
+# use markdown format by default
+YARD_OPTIONS ?= -o . -m markdown
+
+# yard specific clean
+clean-local:
+ rm -rf js css Yast .yardoc
+
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB)
#including *.pm, for the index
- ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi
for i in $(AUTODOCS_PM); do \
b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
+ if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(AUTODOCS_RB); fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.24.0/configure.ac new/yast2-add-on-2.24.1/configure.ac
--- old/yast2-add-on-2.24.0/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-add-on-2.24.1/configure.ac 2013-07-25 17:36:51.000000000 +0200
@@ -0,0 +1,157 @@
+dnl configure.ac for yast2-add-on
+dnl
+dnl -- This file is generated by y2autoconf 2.24.5 - DO NOT EDIT! --
+dnl (edit configure.ac.in or configure.in.in instead)
+
+AC_INIT(yast2-add-on, 2.24.1, http://bugs.opensuse.org/, yast2-add-on)
+dnl Check for presence of file 'RPMNAME'
+AC_CONFIG_SRCDIR([RPMNAME])
+
+dnl Checking host/target/build systems, for make, install etc.
+AC_CANONICAL_TARGET
+dnl Perform program name transformation
+AC_ARG_PROGRAM
+
+AC_PREFIX_DEFAULT(/usr)
+
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
+
+dnl Important YaST2 variables
+VERSION="2.24.1"
+RPMNAME="yast2-add-on"
+MAINTAINER="Ladislav Slezak
participants (1)
-
root@hilbert.suse.de