ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 556344 from home:lchen:branches:network:ha-clustering:Factory

Browse Source 
- Remove ocfs2console module from spec file

OBS-URL: https://build.opensuse.org/request/show/556344
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=110
This commit is contained in:
Gang He 2017-12-12 06:05:21 +00:00 committed by Git OBS Bridge
parent b809f64532
commit 56c7c885b7
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ocfs2-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 11 10:40:06 UTC 2017 - lchen@suse.com
- Remove ocfs2console module from spec file
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 13:48:49 UTC 2017 - rbrown@suse.com Thu Nov 23 13:48:49 UTC 2017 - rbrown@suse.com

25
ocfs2-tools.spec
View File

@ -21,6 +21,18 @@
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
%endif %endif
#if run "rpmbuild --with=ocfs2console"
#_with_ocfs2console will be automatically defined
%if %{defined _with_ocfs2console}
%define _ocfs2console 1
%else
%if 0%{?suse_version} >= 1500
%define _ocfs2console 0
%else
%define _ocfs2console 1
%endif
%endif
Name: ocfs2-tools Name: ocfs2-tools
Version: 1.8.5 Version: 1.8.5
Release: 0 Release: 0
@ -82,6 +94,7 @@ OCFS2 is the Oracle Cluster File System.
This package contains the core user-space tools needed for creating and This package contains the core user-space tools needed for creating and
managing the file system. managing the file system.
%if 0%{_ocfs2console} == 1
%package -n ocfs2console %package -n ocfs2console
Summary: Oracle Cluster Filesystem 2 GUI tools Summary: Oracle Cluster Filesystem 2 GUI tools
Group: System/Filesystems Group: System/Filesystems
@ -98,6 +111,7 @@ Obsoletes: ocfs2-support < %{version}
OCFS2 is the Oracle Cluster Filesystem. OCFS2 is the Oracle Cluster Filesystem.
This package contains additional tools and a GUI (python-gtk). This package contains additional tools and a GUI (python-gtk).
%endif
%package devel %package devel
Summary: Oracle Cluster File System 2 Development files Summary: Oracle Cluster File System 2 Development files
@ -158,7 +172,14 @@ OCFS2 filesystem.
%build %build
export PROJECT="ocfs2-tools" export PROJECT="ocfs2-tools"
autoreconf -fi -I /usr/share/aclocal autoreconf -fi -I /usr/share/aclocal
%configure --disable-debug --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
%configure --disable-debug \
%if 0%{_ocfs2console} == 1
--enable-ocfs2console=yes \
%endif
--enable-dynamic-fsck=yes \
--enable-dynamic-ctl=yes
make OPTS="%{optflags}" make OPTS="%{optflags}"
cd reflink cd reflink
@ -246,11 +267,13 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
%{_mandir}/man7/ocfs2.7.gz %{_mandir}/man7/ocfs2.7.gz
%{_mandir}/man1/o2info.1.gz %{_mandir}/man1/o2info.1.gz
%if 0%{_ocfs2console} == 1
%files -n ocfs2console %files -n ocfs2console
%defattr(-,root,root) %defattr(-,root,root)
%{_sbindir}/ocfs2console %{_sbindir}/ocfs2console
%{py_sitedir}/ocfs2interface %{py_sitedir}/ocfs2interface
%{_mandir}/man8/ocfs2console.8* %{_mandir}/man8/ocfs2console.8*
%endif
%files o2cb %files o2cb
%defattr(-,root,root) %defattr(-,root,root)