diff options
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/rpm/configure | 17 | ||||
| -rw-r--r-- | packages/rpm/configure.in | 2 | ||||
| -rw-r--r-- | packages/rpm/ndpi.spec.in | 4 | ||||
| -rwxr-xr-x | packages/version.sh | 11 |
4 files changed, 19 insertions, 15 deletions
diff --git a/packages/rpm/configure b/packages/rpm/configure index a0398b00a..f1d1084c3 100755 --- a/packages/rpm/configure +++ b/packages/rpm/configure @@ -583,6 +583,7 @@ PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS +MAJOR_RELEASE GIT_REVISION KERNEL DATE @@ -608,7 +609,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -673,7 +673,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -926,15 +925,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1072,7 +1062,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1225,7 +1215,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1706,6 +1695,7 @@ else fi PACKAGE_VERSION=`../version.sh --release` +MAJOR_RELEASE=`../version.sh --major-release` GIT_REVISION=`../version.sh --revision` ac_config_files="$ac_config_files Makefile ndpi.spec" @@ -1719,6 +1709,7 @@ ac_config_files="$ac_config_files Makefile ndpi.spec" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/packages/rpm/configure.in b/packages/rpm/configure.in index 4153c905d..1eaa0ea34 100644 --- a/packages/rpm/configure.in +++ b/packages/rpm/configure.in @@ -26,6 +26,7 @@ else fi PACKAGE_VERSION=`../version.sh --release` +MAJOR_RELEASE=`../version.sh --major-release` GIT_REVISION=`../version.sh --revision` AC_CONFIG_FILES([Makefile ndpi.spec]) @@ -37,6 +38,7 @@ AC_SUBST(EXTN) AC_SUBST(DATE) AC_SUBST(KERNEL) AC_SUBST(GIT_REVISION) +AC_SUBST(MAJOR_RELEASE) AC_OUTPUT diff --git a/packages/rpm/ndpi.spec.in b/packages/rpm/ndpi.spec.in index 5f7f47fbe..7b9b44365 100644 --- a/packages/rpm/ndpi.spec.in +++ b/packages/rpm/ndpi.spec.in @@ -57,7 +57,8 @@ mkdir -p $RPM_BUILD_ROOT%{bindir} cd $HOME/nDPI; make DESTDIR=$RPM_BUILD_ROOT install; rm $RPM_BUILD_ROOT%{libdir}/libndpi.so rm $RPM_BUILD_ROOT%{libdir}/libndpi.so.? -cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.2.5.0 libndpi.so; cd - +cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so.@MAJOR_RELEASE@; cd - +cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so; cd - mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d cp $HOME/nDPI/packages/etc/ld.so.conf.d/ndpi.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d strip $RPM_BUILD_ROOT%{bindir}/* @@ -70,6 +71,7 @@ rm -fr $RPM_BUILD_ROOT %defattr(-, root, root) /usr/local/lib/libndpi.so +/usr/local/lib/libndpi.so.@MAJOR_RELEASE@ /usr/local/lib/libndpi.so.@PACKAGE_VERSION@ /usr/local/bin/ndpiReader /etc/ld.so.conf.d/ndpi.conf diff --git a/packages/version.sh b/packages/version.sh index 852fcecaa..4ef853249 100755 --- a/packages/version.sh +++ b/packages/version.sh @@ -2,6 +2,7 @@ SCRIPTPATH="$(cd "$(dirname "$0")"; pwd -P)" RELEASE="$(cd ${SCRIPTPATH}; cat ../configure.ac|grep C_INIT|cut -c 21-|rev|cut -c 3-|rev)" +MAJOR_RELEASE="$(cd ${SCRIPTPATH}; cat ../configure.ac|grep C_INIT|cut -c 21-|rev|cut -c 3-|rev|cut -d. -f1)" REVISION="$(cd ${SCRIPTPATH}; git rev-list --all |wc -l | tr -d '[[:space:]]')" get_release() { @@ -9,6 +10,11 @@ get_release() { exit 0 } +get_major_release() { + echo "${MAJOR_RELEASE}" + exit 0 +} + get_revision() { echo "${REVISION}" exit 0 @@ -23,6 +29,9 @@ case "$1" in --release) get_release; ;; + --major-release) + get_major_release; + ;; --revision) get_revision; ;; @@ -30,7 +39,7 @@ case "$1" in get_version; ;; *) - echo "Usage: ${0} {--release|--revision|--version}" + echo "Usage: ${0} {--release|--major-release|--revision|--version}" exit 1 esac |