Attachment 688391 Details for Bug 891244 – Patch that remove conflicts tag. Moves libeio shared libraries into a separate directory under libdir

[patch] Patch that remove conflicts tag. Moves libeio shared libraries into a separate directory under libdir

eio-remove-conflicts-2.patch (text/plain), 2.36 KB, created by Narasimhan on 2013-01-27 12:03:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Narasimhan

Created: 2013-01-27 12:03:13 UTC

Size: 2.36 KB

patch

obsolete

>--- eio_old.spec	2013-01-02 11:10:56.000000000 +0000
>+++ eio.spec	2013-01-27 10:39:05.869486613 +0000
>@@ -1,6 +1,6 @@
> Name:           eio
> Version:        1.7.4
>-Release:        1%{?dist}
>+Release:        3%{?dist}
> Summary:        Extension of ecore for parallel io operations
> License:        LGPLv2+
> Group:          System Environment/Libraries
>@@ -8,7 +8,6 @@
> Source:         http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
> BuildRequires:  doxygen ecore-devel >= %version libeina-devel >= %version
> BuildRequires:  iputils libtool m4 pkgconfig zlib
>-Conflicts:      libeio
> 
> %description
> Enlightenment Input Output Library
>@@ -16,8 +15,6 @@
> %package devel
> Summary:        Eio devel package
> Group:          Development/Libraries
>-Requires:       ecore-devel >= %version
>-Requires:       libeina-devel >= %version
> Requires:       eio = %{version}
> 
> %description devel
>@@ -27,7 +24,7 @@
> %setup -q
> 
> %build
>-%configure  --disable-static --disable-silent-rules --enable-install-examples
>+%configure --libdir=%{_libdir}/%{name} --disable-static --disable-silent-rules --enable-install-examples
> make %{?_smp_mflags}
> make doc
> 
>@@ -44,8 +41,10 @@
> find %{buildroot}%{_docdir} -type f | xargs chmod 0644
> find %{buildroot}%{_docdir} -type d | xargs chmod 0755
> # remove duplicates
>-
> find %{buildroot} -name '*.la' -delete
>+#move .pc file to pkconfig directory under libdir
>+mkdir -p %{buildroot}%{_libdir}/pkgconfig
>+mv %{buildroot}%{_libdir}/%{name}/pkgconfig/%{name}.pc %{buildroot}%{_libdir}/pkgconfig
> 
> %post -p /sbin/ldconfig
> 
>@@ -53,17 +52,27 @@
> 
> %files
> %doc README COPYING NEWS AUTHORS
>-%{_libdir}/libeio*so.1*
>+%dir %{_libdir}/%{name}
>+%{_libdir}/%{name}/libeio*so.1*
> 
> %files devel
>+%dir %{_libdir}/%{name}
> %{_libdir}/pkgconfig/*
> %{_includedir}/*
>-%{_libdir}/libeio.so
>+%{_libdir}/%{name}/libeio.so
> %{_docdir}/%{name}
> %{_mandir}/*/*
> %dir %{_datadir}/%{name}
> %{_datadir}/%{name}/examples
> 
> %changelog
>+* Sun Jan 27 2013 Lakshmi Narasimhan T V <lakshminaras2002@gmail.com> - 1.7.4-3
>+- Remove ld conf file.
>+- Packages dependent on eio should pass -R {libdir}/eio flag to libtool
>+
>+* Sat Jan 19 2013 Lakshmi Narasimhan T V <lakshminaras2002@gmail.com> - 1.7.4-2
>+- Remove conflicts tag. Move shared library to a subdirectory under libdir 
>+- Create a ld conf file. 
>+
> * Fri Dec 28 2012 Rahul Sundaram <sundaram@fedoraproject.org> - 1.7.4-1 
> - initial spec

Actions: View | Diff

Attachments on bug 891244: 688391