mod_netconf: fix RPM metadata new release of RPM
- refs #643
diff --git a/src/configure b/src/configure
index 65e6dd7..2b1a925 100755
--- a/src/configure
+++ b/src/configure
@@ -656,6 +656,8 @@
LIBNETCONF_CFLAGS
PKG_CONFIG
RELEASE
+USERMAIL
+USERNAME
RPMBUILD
INSTALL_DATA
INSTALL_SCRIPT
@@ -1971,7 +1973,12 @@
-RELEASE=1
+USERNAME=`git config --get user.name`
+USERMAIL=`git config --get user.email`
+
+
+
+RELEASE=2
LIBS="-lnetconf -ljson"
@@ -1983,7 +1990,7 @@
ARCSID="-DARCSID='\\\"\$(IDNOGIT)\\\"'"
fi
-REQS="$REQS httpd php json-c"
+REQS="$REQS httpd json-c"
BUILDREQS="$BUILDREQS json-c-devel httpd-devel"
# Checks for libraries.
@@ -2222,7 +2229,7 @@
$as_echo "yes" >&6; }
:
fi
- BUILDREQS="$BUILDREQS ,libnetconf-devel"
+ BUILDREQS="$BUILDREQS libnetconf-devel"
fi
@@ -2231,7 +2238,7 @@
-REQS="$REQS , libnetconf"
+REQS="$REQS libnetconf"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4025,6 +4032,8 @@
else
CFLAGS="$CFLAGS -DWITH_NOTIFICATIONS "
LIBS="-lwebsockets $LIBS"
+ REQS="$REQS libwebsockets"
+ BUILDREQS="$BUILDREQS libwebsockets-devel"
fi
@@ -4032,6 +4041,8 @@
CFLAGS="$CFLAGS -DWITH_NOTIFICATIONS "
LIBS="-lwebsockets $LIBS"
+ REQS="$REQS libwebsockets"
+ BUILDREQS="$BUILDREQS libwebsockets-devel"
fi
diff --git a/src/configure.in b/src/configure.in
index 191a51a..e965e12 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -12,7 +12,12 @@
# Check for rpmbuil
AC_CHECK_PROG(RPMBUILD, rpmbuild, rpmbuild)
-RELEASE=1
+USERNAME=`git config --get user.name`
+USERMAIL=`git config --get user.email`
+AC_SUBST(USERNAME)
+AC_SUBST(USERMAIL)
+
+RELEASE=2
AC_SUBST(RELEASE)
LIBS="-lnetconf -ljson"
@@ -24,7 +29,7 @@
ARCSID="-DARCSID='\\\"\$(IDNOGIT)\\\"'"
fi
-REQS="$REQS httpd php json-c"
+REQS="$REQS httpd json-c"
BUILDREQS="$BUILDREQS json-c-devel httpd-devel"
# Checks for libraries.
@@ -37,14 +42,14 @@
LIBNETCONF_WITH=" --with-libnetconf=$withval"],
[# get info from pkg-config about installed package
PKG_CHECK_MODULES(LIBNETCONF, libnetconf)
- BUILDREQS="$BUILDREQS ,libnetconf-devel"]
+ BUILDREQS="$BUILDREQS libnetconf-devel"]
)
CFLAGS="$LIBNETCONF_CFLAGS"
LIBS="$LIBS $LIBNETCONF_LIBS"
AC_SUBST([LIBNETCONF_LIBS])
AC_SUBST([LIBNETCONF_CFLAGS])
AC_SUBST([LIBNETCONF_WITH])
-REQS="$REQS , libnetconf"
+REQS="$REQS libnetconf"
AC_CHECK_LIB([netconf], [ncds_new],[],AC_MSG_ERROR([libnetconf not found.]))
# Checks for header files.
@@ -65,10 +70,14 @@
AS_IF([test "x$with_notifications" == "xno"],[CFLAGS="$CFLAGS"],
[ CFLAGS="$CFLAGS -DWITH_NOTIFICATIONS "
LIBS="-lwebsockets $LIBS"
+ REQS="$REQS libwebsockets"
+ BUILDREQS="$BUILDREQS libwebsockets-devel"
]),
[
CFLAGS="$CFLAGS -DWITH_NOTIFICATIONS "
LIBS="-lwebsockets $LIBS"
+ REQS="$REQS libwebsockets"
+ BUILDREQS="$BUILDREQS libwebsockets-devel"
]
)
diff --git a/src/mod_netconf.spec.in b/src/mod_netconf.spec.in
index 0d8b976..fd57b3f 100644
--- a/src/mod_netconf.spec.in
+++ b/src/mod_netconf.spec.in
@@ -14,7 +14,7 @@
Requires: @REQS@
%description
-Web user interface for Netopeer client using Symfony2 framework.
+Back-end for web user interface of Netopeer client.
%prep
%setup