File project.diff of Package ocfs2-tools

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ocfs2-tools (Revision 4ce6c8ae024ae86a038f2fc0ab371d2a)

Currently displaying revision 4ce6c8ae024ae86a038f2fc0ab371d2a , Show latest

--- ocfs2-tools.changes.orig
+++ ocfs2-tools.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Wed Dec 13 03:11:37 UTC 2017 - lchen@suse.com
+
+- Remove install procedures for ocfs2console 
+
+-------------------------------------------------------------------
+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
 
 - Replace references to /var/adm/fillup-templates with new 
--- ocfs2-tools.spec.orig
+++ ocfs2-tools.spec
@@ -21,6 +21,18 @@
   %define _fillupdir /var/adm/fillup-templates
 %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
 Version:        1.8.5
 Release:        0
@@ -55,8 +67,6 @@ BuildRequires:  libcorosync-devel
 BuildRequires:  libdlm-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libz1
-BuildRequires:  python-devel
-BuildRequires:  python-gtk-devel
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(glib-2.0)
@@ -82,9 +92,12 @@ OCFS2 is the Oracle Cluster File System.
 This package contains the core user-space tools needed for creating and
 managing the file system.
 
+%if 0%{_ocfs2console} == 1
 %package -n ocfs2console
 Summary:        Oracle Cluster Filesystem 2 GUI tools
 Group:          System/Filesystems
+BuildRequires:  python-devel
+BuildRequires:  python-gtk-devel
 Requires:       e2fsprogs
 Requires:       glib2 >= 2.2.3
 Requires:       ocfs2-tools = %{version}
@@ -98,6 +111,7 @@ Obsoletes:      ocfs2-support < %{versio
 OCFS2 is the Oracle Cluster Filesystem.
 
 This package contains additional tools and a GUI (python-gtk).
+%endif
 
 %package devel
 Summary:        Oracle Cluster File System 2 Development files
@@ -158,7 +172,14 @@ OCFS2 filesystem.
 %build
 export PROJECT="ocfs2-tools"
 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}"
 
 cd reflink
@@ -200,8 +221,9 @@ mv %{buildroot}/{,/usr}/sbin/debugfs.ocf
 chmod a-x %{buildroot}/%{_libdir}/libo2cb.a
 chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a
 chmod a-x %{buildroot}/%{_libdir}/libocfs2.a
+%if 0%{_ocfs2console} == 1
 python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
-
+%endif
 %preun o2cb
 %stop_on_removal ocfs2
 %stop_on_removal o2cb
@@ -246,11 +268,13 @@ python -c "import compileall; compileall
 %{_mandir}/man7/ocfs2.7.gz
 %{_mandir}/man1/o2info.1.gz
 
+%if 0%{_ocfs2console} == 1
 %files -n ocfs2console
 %defattr(-,root,root)
 %{_sbindir}/ocfs2console
 %{py_sitedir}/ocfs2interface
 %{_mandir}/man8/ocfs2console.8*
+%endif
 
 %files o2cb
 %defattr(-,root,root)

Places

File project.diff of Package ocfs2-tools (Revision 4ce6c8ae024ae86a038f2fc0ab371d2a)

Places