Merge pull request #9 from ggtakec/update_spec

Fixed RPM package name and version pair

buildutils/php-pecl-k2hash.spec.in

@@ -21,9 +21,18 @@
 # REVISION:
 #
 
+#
 # we don't want -z defs linker flag
+#
 %undefine _strict_symbol_defs_build
 
+#
+# Local macros/define
+#
+%if %{undefined package_revision}
+%global package_revision 1
+%endif
+
 %if 0%{?scl:1}
 %global phproot     /opt/remi/%scl_php/root
 %global scl_vendor  remi
@@ -47,7 +56,7 @@
 Summary:       A k2hash PHP module written in C
 Name:          %{?sub_prefix}@K2H_EXT_PKGNAME@
 Version:       @K2H_EXT_VERSION@
-Release:       @K2H_EXT_RELEASE@%{?dist}%{!?scl:%{!?nophptag:@K2H_PHP_VERSION@}}
+Release:       %{package_revision}%{?dist}
 License:       MIT
 Group:         Development/Languages
 URL:           https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@/

config.m4

@@ -112,7 +112,6 @@ if test "${K2H_HAVE_PHP_BINARY}" = "yes"; then
 	AC_SUBST([K2H_PHP_MAJOR_VERSION], [$(php -r 'echo "".PHP_MAJOR_VERSION."";')])
 	AC_SUBST([K2H_PHP_MINOR_VERSION], [$(php -r 'echo "".PHP_MINOR_VERSION."";')])
 	AC_SUBST([K2H_EXT_PKGNAME],       [$(head -n 1 $(pwd)/ChangeLog | awk '{print $1}')])
-	AC_SUBST([K2H_EXT_RELEASE],       [$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/^.*-//g')])
 	AC_SUBST([K2H_EXT_VERSION],       [$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/-.*$//g')])
 
 	AC_DEFINE_UNQUOTED(PHP_K2HASH_VERSION, ["$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/-.*$//g')"], [ PHP Extension version ])
@@ -122,7 +121,6 @@ else
 	AC_SUBST([K2H_PHP_MAJOR_VERSION], "0")
 	AC_SUBST([K2H_PHP_MINOR_VERSION], "0")
 	AC_SUBST([K2H_EXT_PKGNAME],       "php-pecl-k2hash")
-	AC_SUBST([K2H_EXT_RELEASE],       "0")
 	AC_SUBST([K2H_EXT_VERSION],       "0.0.0")
 
 	AC_DEFINE(PHP_K2HASH_VERSION,     "0.0.0", [ PHP Extension version ])