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.

Sign up for GitHub

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

Jump to bottom

Fix maintainer substitution #62

Merged
merged 4 commits into from Oct 8, 2014
Merged

Fix maintainer substitution #62

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d44bb2e
remove maintainer macro as we use now osc maintainer command instead
jreidinger Sep 23, 2014
05b0cb7
release
jreidinger Sep 23, 2014
e4e9828
more precise specify maintainer file
jreidinger Sep 23, 2014
b47f26c
a more informative changelog
mvidner Oct 8, 2014
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: 0 additions & 2 deletions build-tools/aclocal/y2autoconf.m4
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@ AC_CONFIG_SRCDIR([RPMNAME])

RPMNAME=`cat RPMNAME`
VERSION=`cat VERSION`
MAINTAINER=`cat MAINTAINER`

AC_INIT($RPMNAME, $VERSION, http://bugs.opensuse.org/, $RPMNAME)

Expand All @@ -23,7 +22,6 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
AC_SUBST(VERSION)
AC_SUBST(RPMNAME)
AC_SUBST(MAINTAINER)

dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
Expand Down
7 changes: 0 additions & 7 deletions build-tools/scripts/y2autoconf
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@ my $message = << 'END';
#Available macros in the configure.ac.in:
# @RPMNAME@ - reads it from file RPMNAME
# @VERSION@ - reads it from package/*.spec file
# @MAINTAINER@ - reads it from file MAINTAINER
#
# @YAST2-INIT-COMMON@ - Initialization. The generated configure.ac
# will not work without it (or its equivalent)
Expand Down Expand Up @@ -42,9 +41,6 @@ chomp $RPMNAME;
$VERSION = `grep -m 1 '^[[:space:]]*Version:' package/$RPMNAME.spec | sed -e 's/Version:[[:space:]]*\\([[:print:]]\\+\\)/\\1/'`;
chomp $VERSION;

$MAINTAINER = `cat MAINTAINER`;
chomp $MAINTAINER;

# Better finding of subdirs: do not do "find" since that does not
# honor SUBDIRS in Makefiles.am and that messes with the skeletons

Expand Down Expand Up @@ -88,7 +84,6 @@ $OUTPUT = join ("\n", map { "$_/Makefile" } @SUBDIRS);
# common variables
'@RPMNAME@' => $RPMNAME,
'@VERSION@' => $VERSION,
'@MAINTAINER@' => $MAINTAINER,

# init: common stuff
'@YAST2-INIT-COMMON@' =>
Expand All @@ -109,7 +104,6 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
VERSION=\"$VERSION\"
RPMNAME=\"$RPMNAME\"
MAINTAINER=\"$MAINTAINER\"
". '
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
Expand Down Expand Up @@ -144,7 +138,6 @@ desktopdir=\${prefix}/share/applications/YaST2

AC_SUBST(VERSION)
AC_SUBST(RPMNAME)
AC_SUBST(MAINTAINER)

AC_SUBST(pkgconfigdir)
AC_SUBST(pkgconfigdatadir)
Expand Down
2 changes: 1 addition & 1 deletion build-tools/scripts/y2automake
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ common=$y2adminpath/Makefile.am.common

RPMNAME=`cat ./RPMNAME`

if [ ! -e MAINTAINER ]; then
if [ ! -e RPMNAME ]; then
echo "${self} ERROR: Start this only in YaST2 toplevel project directories!" >&2
exit 1
fi
Expand Down
6 changes: 6 additions & 0 deletions package/yast2-devtools.changes
View file
Open in desktop
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 23 09:25:35 UTC 2014 - jreidinger@suse.com

- prevent crash for non standard maintainer file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's MAINTAINER file, just to not confuse somebody...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, will change ti

- 3.1.25

-------------------------------------------------------------------
Fri Sep 5 12:51:57 UTC 2014 - mvidner@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-devtools.spec
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@


Name: yast2-devtools
Version: 3.1.24
Version: 3.1.25
Release: 0
Url: http://github.com/yast/yast-devtools

Expand Down