Skip to content

Commit

Permalink
remove maintainer macro as we use now osc maintainer command instead
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Sep 23, 2014
1 parent 38d31bb commit d44bb2e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
2 changes: 0 additions & 2 deletions build-tools/aclocal/y2autoconf.m4
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit d44bb2e

Please sign in to comment.