From c7b0123581576d84c6e088386eed6e6262506c0ab086165d31f85576f228b1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 31 May 2015 11:20:18 +0000 Subject: [PATCH] Accepting request 309341 from home:XRevan86 - Add baselibs.conf to enable multilib. OBS-URL: https://build.opensuse.org/request/show/309341 OBS-URL: https://build.opensuse.org/package/show/network/libverto?expand=0&rev=4 --- baselibs.conf | 4 ++ libverto.changes | 6 ++ libverto.spec | 164 ++++++++++++++++++++++++----------------------- 3 files changed, 93 insertions(+), 81 deletions(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..7742832 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,4 @@ +libverto1 +libverto-glib1 +libverto-libev1 +libverto-tevent1 diff --git a/libverto.changes b/libverto.changes index d50cad7..c45e65c 100644 --- a/libverto.changes +++ b/libverto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 30 13:12:32 UTC 2015 - sor.alexei@meowr.ru + +- Add baselibs.conf to enable multilib. +- Spec cleanup. + ------------------------------------------------------------------- Fri May 8 14:55:09 CEST 2015 - pth@suse.de diff --git a/libverto.spec b/libverto.spec index 4cfb16f..6d407d1 100644 --- a/libverto.spec +++ b/libverto.spec @@ -16,24 +16,25 @@ # +%define sover 1 Name: libverto Version: 0.2.6 Release: 0 Summary: Main loop abstraction library License: MIT Group: Development/Libraries/C and C++ -Url: https://fedorahosted.org/libverto/ -Source0: http://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz +Url: https://fedorahosted.org/libverto +Source: http://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz +Source1: baselibs.conf +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libev) +BuildRequires: pkgconfig(tevent) -BuildRequires: glib2-devel -BuildRequires: libev-devel -BuildRequires: libtevent-devel -%global lib_version 1 - -%description -n libverto -libverto provides a way for libraries to expose asynchronous interfaces -without having to choose a particular event loop, offloading this -decision to the end application which consumes the library. +%description +libverto provides a way for libraries to expose asynchronous +interfaces without having to choose a particular event loop, +offloading this decision to the end application which consumes the +library. If you are packaging an application, not library, based on libverto, you should depend either on a specific implementation module or you @@ -43,14 +44,15 @@ timeout and signal functionality. Currently glib is the only module that does not provide these three because it lacks signal. However, glib will support signal in the future. -%package -n libverto%{lib_version} +%package -n %{name}%{sover} Summary: Runtime libraries for libverto -Group: System/Libraries +Group: Development/Libraries/C and C++ -%description -n libverto%{lib_version} -libverto provides a way for libraries to expose asynchronous interfaces -without having to choose a particular event loop, offloading this -decision to the end application which consumes the library. +%description -n %{name}%{sover} +libverto provides a way for libraries to expose asynchronous +interfaces without having to choose a particular event loop, +offloading this decision to the end application which consumes the +library. If you are packaging an application, not library, based on libverto, you should depend either on a specific implementation module or you @@ -61,78 +63,74 @@ that does not provide these three because it lacks signal. However, glib will support signal in the future. %package devel -Summary: Development files for %{name} +Summary: Development files for libverto Group: Development/Libraries/C and C++ -Requires: %{name}%{lib_version} = %{version} -Requires: pkgconfig +Requires: %{name}%{sover} = %{version} %description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. +The libverto-devel package contains libraries and header files +for developing applications that use libverto. -%package glib%{lib_version} -Summary: Backend module for %{name} - glib +%package glib%{sover} +Summary: Backend module for libverto -- glib Group: Development/Libraries/C and C++ -%description glib%{lib_version} -Module for %{name} which provides integration with glib. +%description glib%{sover} +Module for libverto which provides integration with glib. -This package does NOT yet provide %{name}-module-base. +This package does NOT yet provide libverto-module-base. %package glib-devel -Summary: Development files for %{name}-glib%{lib_version} +Summary: Development files for libverto-glib%{sover} Group: Development/Libraries/C and C++ -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-glib%{lib_version}%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version} +Requires: %{name}-glib%{sover}%{?_isa} = %{version} %description glib-devel -The %{name}-glib-devel package contains libraries and header files for -developing applications that use %{name}-glib%{lib_version}. +The libverto-glib-devel package contains libraries and header files +for developing applications that use libverto-glib. -%package tevent%{lib_version} -Summary: Backend module for %{name} - tevent +%package tevent%{sover} +Summary: Backend module for libverto -- tevent Group: Development/Libraries/C and C++ -Provides: %{name}-module-base = %{version}-%{release} +Provides: %{name}-module-base = %{version} -%description tevent%{lib_version} -Module for %{name} which provides integration with tevent. +%description tevent%{sover} +Module for libverto which provides integration with tevent. -This package provides %{name}-module-base since it supports io, timeout -and signal. +This package provides libverto-module-base since it supports io, +timeout and signal. %package tevent-devel -Summary: Development files for %{name}-tevent%{lib_version} +Summary: Development files for libverto-tevent%{sover} Group: Development/Libraries/C and C++ -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-tevent%{lib_version}%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version} +Requires: %{name}-tevent%{sover}%{?_isa} = %{version} %description tevent-devel -The %{name}-tevent-devel package contains libraries and header files for -developing applications that use %{name}-tevent. +The libverto-tevent-devel package contains libraries and header +files for developing applications that use libverto-tevent. -%package libev%{lib_version} -Summary: Backend module for %{name} - libev%{lib_version} +%package libev%{sover} +Summary: Backend module for libverto -- libev%{sover} Group: Development/Libraries/C and C++ -Provides: %{name}-module-base = %{version}-%{release} +Provides: %{name}-module-base = %{version} -%description libev%{lib_version} -Module for %{name} which provides integration with libev. +%description libev%{sover} +Module for libverto which provides integration with libev. -This package provides %{name}-module-base since it supports io, timeout -and signal. +This package provides libverto-module-base since it supports io, +timeout and signal. %package libev-devel -Summary: Development files for %{name}-libev%{lib_version} +Summary: Development files for libverto-libev%{sover} Group: Development/Libraries/C and C++ -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-libev%{lib_version}%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version} +Requires: %{name}-libev%{sover}%{?_isa} = %{version} %description libev-devel -The %{name}-libev-devel package contains libraries and header files for -developing applications that use %{name}-libev. - -This package provides %{name}-module-base since it supports io, timeout -and signal. +The libverto-libev-devel package contains libraries and header +files for developing applications that use libverto-libev. %prep %setup -q @@ -142,60 +140,64 @@ and signal. make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -find %{buildroot} -name '*.la' -delete +%make_install +find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -name '*.so.*T' -delete -%post -n libverto%{lib_version} -p /sbin/ldconfig -%postun -n libverto%{lib_version} -p /sbin/ldconfig +%post -n libverto%{sover} -p /sbin/ldconfig -%post glib%{lib_version} -p /sbin/ldconfig -%postun glib%{lib_version} -p /sbin/ldconfig +%postun -n libverto%{sover} -p /sbin/ldconfig -%post tevent%{lib_version} -p /sbin/ldconfig -%postun tevent%{lib_version} -p /sbin/ldconfig +%post glib%{sover} -p /sbin/ldconfig -%post libev%{lib_version} -p /sbin/ldconfig -%postun libev%{lib_version} -p /sbin/ldconfig +%postun glib%{sover} -p /sbin/ldconfig -%files -n libverto%{lib_version} -%defattr(-,root,root,-) +%post tevent%{sover} -p /sbin/ldconfig + +%postun tevent%{sover} -p /sbin/ldconfig + +%post libev%{sover} -p /sbin/ldconfig + +%postun libev%{sover} -p /sbin/ldconfig + +%files -n libverto%{sover} +%defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README COPYING %{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/verto.h %{_includedir}/verto-module.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%files glib%{lib_version} -%defattr(-,root,root,-) +%files glib%{sover} +%defattr(-,root,root) %{_libdir}/%{name}-glib.so.* %files glib-devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/verto-glib.h %{_libdir}/%{name}-glib.so %{_libdir}/pkgconfig/%{name}-glib.pc -%files tevent%{lib_version} -%defattr(-,root,root,-) +%files tevent%{sover} +%defattr(-,root,root) %{_libdir}/%{name}-tevent.so.* %files tevent-devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/verto-tevent.h %{_libdir}/%{name}-tevent.so %{_libdir}/pkgconfig/%{name}-tevent.pc -%files libev%{lib_version} -%defattr(-,root,root,-) +%files libev%{sover} +%defattr(-,root,root) %{_libdir}/%{name}-libev.so.* %files libev-devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/verto-libev.h %{_libdir}/%{name}-libev.so %{_libdir}/pkgconfig/%{name}-libev.pc