LU-7645 build: Remove unused --with-release configure option

[fs/lustre-release.git] / lustre.spec.in

diff --git a/lustre.spec.in b/lustre.spec.in
index 2983636..eba78aa 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -35,17 +35,6 @@
 # selection with our selection.
 %{!?kernel_version: %global kernel_version %kversion}
 
-%if 0%{?build_src_rpm}
-    %{!?myrelease: %global myrelease 1}
-%else
-    %{!?myrelease: %global myrelease %(echo %kversion | tr '-' '_')}
-    # for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
-    # of %kversion
-    %define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/-default$//')
-%endif
-
-%define fullrelease %{myrelease}
-
 # in order to get kernel symset and/or kernel module dependencies into
 # the RPM, in order to support weak-modules, the internal dependency gen-
 # erator needs to be disabled
@@ -94,6 +83,7 @@
        %global requires_kmod_version %{version}
 %else  #for Suse
        %global requires_kmod_name %{lustre_name}-kmp
+       %define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/-default$//')
        %if 0%{?suse_version} >= 1200
                %global requires_kmod_version %{version}_k%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;')
        %else
@@ -104,7 +94,7 @@
 Summary: Lustre File System
 Name: %{lustre_name}
 Version: %{version}
-Release: %{fullrelease}
+Release: 1%{?dist}
 License: GPL
 Group: Utilities/System
 Source: lustre-%{version}.tar.gz
@@ -124,7 +114,7 @@ BuildRequires: libtool
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
-Provides: lustre-client = %{version}-%{fullrelease}
+Provides: lustre-client = %{version}-%{release}
 %endif
 # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
@@ -273,7 +263,6 @@ fi
        %{!?with_zfs:--without-zfs} \
        %{!?with_lnet_dlc:--disable-dlc} \
        %{!?with_manpages:--disable-manpages} \
-       --with-release=%{release} \
        --with-linux=%{kdir} \
        --with-linux-obj=%{kobjdir} \
        --with-kmp-moddir=%{kmoddir}/%{name}