Attachment 619821 Details for Bug 820659 – Patch to spec file with changes to comply with guidelines

[patch] Patch to spec file with changes to comply with guidelines

python-ufc.spec.patch (text/plain), 1.65 KB, created by José Matos on 2012-10-01 14:37:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: José Matos

Created: 2012-10-01 14:37:12 UTC

Size: 1.65 KB

patch

obsolete

>--- python-ufc.spec.old	2012-10-01 15:32:16.838504746 +0100
>+++ python-ufc.spec	2012-10-01 15:34:05.513191262 +0100
>@@ -5,7 +5,7 @@
> 
> Name:		python-%{srcname}
> Version:	%{majorver}.%{minorver}.%{pointver}
>-Release:	0.1%{?dist}
>+Release:	0.2%{?dist}
> Summary:	A unified framework for finite element assembly
> Group:		Applications/Engineering
> 
>@@ -30,12 +30,14 @@
> Patch0:	        ufc-2.0.5-fix-python-module-install.patch
> # Except that patch doesn't quite fix it
> Patch1:	      	ufc-2.0.5-really-fix-python-module-install.patch
>+# Fix lib install path (required by pkg-config file)
>+Patch2:         ufc-2.0.5-fix-lib-path.patch
> 
> BuildRoot:	%{_tmppath}/%{srcname}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> Requires: 	swig
> 
>-%if (0%{?rhel} <= 6)
>+%if (0%{?rhel} <= 6 && !0%{?fedora})
> BuildRequires:	cmake28
> %else
> BuildRequires:	cmake
>@@ -56,11 +58,12 @@
> 
> %prep
> %setup -q -n %{srcname}-%{version}
>+%patch2 -p0 -b .fix-lib-path
> %patch0 -p0 -b .fix-python-module-install
> %patch1 -p0 -b .really-fix-python-module-install
> 
> %build
>-%if (0%{?rhel} <= 6)
>+%if (0%{?rhel} <= 6 && !0%{?fedora})
> %cmake28 .
> %else
> %cmake .
>@@ -85,13 +88,17 @@
> %defattr(-,root,root,-)
> %doc README AUTHORS TODO ChangeLog doc/manual/ufc-user-manual.pdf doc/sphinx
> %{_includedir}/ufc.h
>-/usr/lib/pkgconfig/ufc-1.pc
>+%{_libdir}/pkgconfig/ufc-1.pc
> %{python_sitelib}/ufc_utils
> %{python_sitearch}/ufc
> %{_datadir}/ufc
> %{_includedir}/swig/ufc.i
> 
> %changelog
>+* Mon Oct  1 2012 JosÃ© Matos <jamatos@fedoraproject.org> - 2.0.5-0.2
>+- Fix conditionals for Fedora
>+- Fix path for pkgconfig file
>+
> * Fri May  4 2012 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 2.0.5-0.1
> - Initial package
>

Actions: View | Diff

Attachments on bug 820659: 619821 | 619823