Attachment 295445 Details for Bug 431277 – Suggested spec changes in diff format

[patch] Suggested spec changes in diff format

ocfs2-tools.spec.diff (text/plain), 5.33 KB, created by Jarod Wilson on 2008-02-20 20:41:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jarod Wilson

Created: 2008-02-20 20:41:23 UTC

Size: 5.33 KB

patch

obsolete

>--- ocfs2-tools.spec.orig	2008-02-20 14:42:20.000000000 -0500
>+++ ocfs2-tools.spec	2008-02-20 15:40:30.000000000 -0500
>@@ -1,12 +1,12 @@
> %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
> 
>-%define compile_console 1
>+%define with_console %{?_without_console: 0} %{?!_without_console: 1}
> %define alphatag 20080131git
> 
> Summary: Tools for managing the Ocfs2 cluster file system
> Name: ocfs2-tools
> Version: 1.3.9
>-Release: 5.%{alphatag}%{dist}
>+Release: 5.%{alphatag}%{?dist}
> License: GPLv2
> Group: System Environment/Base
> # The source for this package was pulled from upstream's git repo and manually
>@@ -20,8 +20,13 @@ Group: System Environment/Base
> #   tar -czvf ocfs2-tools-1.3.9.tar.gz ocfs2-tools-1.3.9
> Source: %{name}-%{version}.tar.gz
> URL: http://oss.oracle.com/projects/ocfs2-tools/
>-Requires: bash, coreutils, net-tools, modutils, e2fsprogs, chkconfig, glib2 >= 2.2.3
>-BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3, pygtk2 >= 1.99.16, python-devel >= 2.5
>+Requires(post): chkconfig
>+Requires(preun): chkconfig
>+Requires(preun): /sbin/service
>+Requires: bash, coreutils, net-tools, modutils
>+Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3
>+BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
>+BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
> BuildRequires: ncurses-devel, readline-devel, desktop-file-utils
> 
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
>@@ -37,13 +42,12 @@ non-clustered use. Ocfs2 leverages some 
> technologies, such as JBD - the same journaling subsystem in use by
> ext3.
> 
>-%if %{compile_console}
>-%define config_console --enable-ocfs2console=yes
>-
>+%if %{with_console}
> %package -n ocfs2console
> Summary: GUI frontend for Ocfs2 management
> Group: System Environment/Kernel
>-Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, pygtk2 >= 1.99.16, python >= 2.5, ocfs2-tools = %{version}-%{release}
>+Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, pygtk2 >= 1.99.16
>+Requires: python >= 2.5, ocfs2-tools = %{version}-%{release}
> 
> 
> %description -n ocfs2console
>@@ -51,29 +55,33 @@ Ocfs2console can make it easier to manag
> providing a gui front-end to common tasks, including initial cluster
> setup.  In addition to cluster setup, Ocfs2console can format and
> mount Ocfs2 volumes.
>-%else
>-%define config_console --enable-ocfs2console=no
> %endif
> 
>-%package -n ocfs2-tools-devel
>+%package devel
> Summary: Headers and static archives for ocfs2-tools
> Group: Development/Libraries
>-Requires: e2fsprogs-devel, glib2-devel >= 2.2.3, ocfs2-tools = %{version}-%{release}
>-Provides: ocfs2-tools-static = %{version}-%{release}
>+Requires: e2fsprogs-devel, glib2-devel >= 2.2.3, pkgconfig
>+Requires: %{name} = %{version}-%{release}
>+Provides: %{name}-static = %{version}-%{release}
> 
>-%description -n ocfs2-tools-devel
>+%description devel
> ocfs2-tools-devel contains the libraries and header files needed to
> develop Ocfs2 filesystem-specific programs.
> 
> 
> 
> %prep
>-%setup -q -n ocfs2-tools-%{version}
>+%setup -q
> 
> 
> %build
>-#%configure --enable-dynamic-fsck=yes --enable-ocfs2console=no
>-%configure --enable-dynamic-fsck=yes %{config_console}
>+%configure \
>+%if ! %{with_console}
>+    --enable-ocfs2console=no \
>+%endif
>+    --enable-dynamic-fsck=yes
>+
>+# parallel build currently fails, so no %{_smp_mflags}
> make
> 
> 
>@@ -90,7 +98,7 @@ make DESTDIR="$RPM_BUILD_ROOT" install
> 
> chmod 644 $RPM_BUILD_ROOT/%{_libdir}/*.a
> 
>-%if %{compile_console}
>+%if %{with_console}
> %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')"
> # rpm autostripper needs to see these as executable
> chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface/*.so
>@@ -108,17 +116,19 @@ rm -rf "$RPM_BUILD_ROOT"
> 
> 
> %post
>-/sbin/chkconfig --add o2cb >/dev/null
>-/sbin/chkconfig --add ocfs2 >/dev/null
>+/sbin/chkconfig --add o2cb
>+/sbin/chkconfig --add ocfs2
> 
> %preun
> if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
>-        /sbin/chkconfig --del ocfs2 >/dev/null
>-        /sbin/chkconfig --del o2cb >/dev/null
>+        /sbin/service ocfs2 stop >/dev/null 2>&1 || :
>+        /sbin/service o2cb stop >/dev/null 2>&1 || :
>+        /sbin/chkconfig --del ocfs2
>+        /sbin/chkconfig --del o2cb
> fi
> 
> %files
>-%defattr(-,root,root)
>+%defattr(-,root,root,-)
> %doc README.O2CB COPYING CREDITS MAINTAINERS
> %doc documentation/users_guide.txt
> /sbin/fsck.ocfs2
>@@ -145,24 +155,30 @@ fi
> %{_mandir}/man8/ocfs2cdsl.8.gz
> 
> 
>-%if %{compile_console}
>+%if %{with_console}
> %files -n ocfs2console
>-%defattr(-,root,root)
>-%{python_sitearch}/ocfs2interface
>+%defattr(-,root,root,-)
>+%dir %{python_sitearch}/ocfs2interface
>+%{python_sitearch}/ocfs2interface/*
> %{_sbindir}/ocfs2console
> %{_mandir}/man8/ocfs2console.8.gz
> %{_datadir}/applications/ocfs2console.desktop
>-%{_datadir}/ocfs2console/
>+%dir %{_datadir}/ocfs2console/
>+%{_datadir}/ocfs2console/*
> %endif
> 
>-%files -n ocfs2-tools-devel
>-%defattr(-,root,root)
>+%files devel
>+%defattr(-,root,root,-)
> %{_libdir}/*.a
> %{_libdir}/pkgconfig/*.pc
>-%{_includedir}/ocfs2-kernel
>-%{_includedir}/o2cb
>-%{_includedir}/o2dlm
>-%{_includedir}/ocfs2
>+%dir %{_includedir}/ocfs2-kernel
>+%dir %{_includedir}/o2cb
>+%dir %{_includedir}/o2dlm
>+%dir %{_includedir}/ocfs2
>+%{_includedir}/ocfs2-kernel/*
>+%{_includedir}/o2cb/*
>+%{_includedir}/o2dlm/*
>+%{_includedir}/ocfs2/*
> 
> 
>

Actions: View | Diff

Attachments on bug 431277: 293957 | 294042 | 295445 | 295556 | 295577 | 295679