IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipalib.version: Add VENDOR_VERSION

Browse Source 
This will allow us to make vendors' lives easier by embedding a
vendor tag to installation logs.

Part of the work for: https://fedorahosted.org/freeipa/ticket/4219

Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Petr Viktorin
2014-03-13 14:39:03 +01:00
parent 8cde6f0d6e
commit 7f465e693c
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -38,6 +38,8 @@ endif # beta
endif # pre endif # pre
endif # ipa_version endif # ipa_version
IPA_VENDOR_VERSION=$(IPA_VERSION)$(IPA_VENDOR_VERSION_SUFFIX)
TARBALL_PREFIX=freeipa-$(IPA_VERSION) TARBALL_PREFIX=freeipa-$(IPA_VERSION)
TARBALL=$(TARBALL_PREFIX).tar.gz TARBALL=$(TARBALL_PREFIX).tar.gz
@@ -133,6 +135,7 @@ version-update: release-update
sed -e s/__NUM_VERSION__/$(IPA_NUM_VERSION)/ install/ui/src/libs/loader.js.in \ sed -e s/__NUM_VERSION__/$(IPA_NUM_VERSION)/ install/ui/src/libs/loader.js.in \
> install/ui/src/libs/loader.js > install/ui/src/libs/loader.js
perl -pi -e "s:__NUM_VERSION__:$(IPA_NUM_VERSION):" ipapython/version.py perl -pi -e "s:__NUM_VERSION__:$(IPA_NUM_VERSION):" ipapython/version.py
perl -pi -e "s:__VENDOR_VERSION__:$(IPA_VENDOR_VERSION):" ipapython/version.py
perl -pi -e "s:__API_VERSION__:$(IPA_API_VERSION_MAJOR).$(IPA_API_VERSION_MINOR):" ipapython/version.py perl -pi -e "s:__API_VERSION__:$(IPA_API_VERSION_MAJOR).$(IPA_API_VERSION_MINOR):" ipapython/version.py
touch -r ipapython/version.py.in ipapython/version.py touch -r ipapython/version.py.in ipapython/version.py
sed -e s/__VERSION__/$(IPA_VERSION)/ daemons/ipa-version.h.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ daemons/ipa-version.h.in \

8
freeipa.spec.in
View File

@@ -360,8 +360,10 @@ export SUPPORTED_PLATFORM=fedora18
export SUPPORTED_PLATFORM=fedora16 export SUPPORTED_PLATFORM=fedora16
%endif %endif
%endif %endif
# Force re-generate of platform support # Force re-generate of platform support
rm -f ipapython/services.py export IPA_VENDOR_VERSION_SUFFIX=-%{release}
rm -f ipapython/services.py ipapython/version.py
make version-update make version-update
cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
@@ -389,7 +391,9 @@ export SUPPORTED_PLATFORM=fedora16
%endif %endif
%endif %endif
# Force re-generate of platform support # Force re-generate of platform support
rm -f ipapython/services.py export IPA_VENDOR_VERSION_SUFFIX=-%{release}
rm -f ipapython/services.py ipapython/version.py
make version-update
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
%else %else

3
ipapython/version.py.in
View File

@@ -20,6 +20,9 @@
# The full version including strings # The full version including strings
VERSION="__VERSION__" VERSION="__VERSION__"
# A fuller version including the vendor tag (e.g. 3.3.3-34.fc20)
VENDOR_VERSION="__VENDOR_VERSION__"
# Just the numeric portion of the version so one can do direct numeric # Just the numeric portion of the version so one can do direct numeric
# comparisons to see if the API is compatible. # comparisons to see if the API is compatible.