diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..53d4ace --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libev-4.15.tar.gz diff --git a/.rh-passenger40-libev.metadata b/.rh-passenger40-libev.metadata new file mode 100644 index 0000000..420de2c --- /dev/null +++ b/.rh-passenger40-libev.metadata @@ -0,0 +1 @@ +88655b1e2c0b328c9f90a6df7e72361a97fa8dc3 SOURCES/libev-4.15.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/libev-4.15-Modernize-the-configure.ac.patch b/SOURCES/libev-4.15-Modernize-the-configure.ac.patch new file mode 100644 index 0000000..b6e9cc8 --- /dev/null +++ b/SOURCES/libev-4.15-Modernize-the-configure.ac.patch @@ -0,0 +1,35 @@ +From c681304443714aabf4ede3682074dd95a6ee6a5c Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 8 Sep 2013 09:39:25 +0400 +Subject: [PATCH 2/3] Modernize the configure.ac + +Without it, Automake 1.13 and above will refuse it. + +See the details for AM_INIT_AUTOMAKE at: + http://www.gnu.org/software/automake/manual/automake.html#Public-Macros + +Signed-off-by: Igor Gnatenko +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f0c6d2b..aa83142 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,10 +1,10 @@ +-AC_INIT ++AC_INIT([libev], [4.15]) + + orig_CFLAGS="$CFLAGS" + + AC_CONFIG_SRCDIR([ev_epoll.c]) + +-AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h! ++AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS([config.h]) + AM_MAINTAINER_MODE + +-- +1.8.3.1 + diff --git a/SOURCES/libev-4.15-Respect-the-CFLAGS-if-defined.patch b/SOURCES/libev-4.15-Respect-the-CFLAGS-if-defined.patch new file mode 100644 index 0000000..7ec368e --- /dev/null +++ b/SOURCES/libev-4.15-Respect-the-CFLAGS-if-defined.patch @@ -0,0 +1,35 @@ +From 288dcead638c2c5597c6ce150d16bd5de6e1ff85 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 8 Sep 2013 09:40:30 +0400 +Subject: [PATCH 3/3] Respect the CFLAGS if defined + +https://bugzilla.redhat.com/show_bug.cgi?id=908096 + +Signed-off-by: Igor Gnatenko +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index aa83142..3a8164b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,13 +1,13 @@ + AC_INIT([libev], [4.15]) + +-orig_CFLAGS="$CFLAGS" +- + AC_CONFIG_SRCDIR([ev_epoll.c]) + + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS([config.h]) + AM_MAINTAINER_MODE + ++orig_CFLAGS="$CFLAGS" ++ + AC_PROG_CC + + dnl Supply default CFLAGS, if not specified +-- +1.8.3.1 + diff --git a/SOURCES/libev-4.15-passenger40-soname.patch b/SOURCES/libev-4.15-passenger40-soname.patch new file mode 100644 index 0000000..e32d3d4 --- /dev/null +++ b/SOURCES/libev-4.15-passenger40-soname.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 059305b..113e4f2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,7 +14,7 @@ include_HEADERS = ev.h ev++.h event.h + lib_LTLIBRARIES = libev.la + + libev_la_SOURCES = ev.c event.c +-libev_la_LDFLAGS = -version-info $(VERSION_INFO) ++libev_la_LDFLAGS = -version-info $(VERSION_INFO) -release passenger40 + + ev.3: ev.pod + pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@ diff --git a/SPECS/libev.spec b/SPECS/libev.spec new file mode 100644 index 0000000..b865510 --- /dev/null +++ b/SPECS/libev.spec @@ -0,0 +1,225 @@ +%{?scl:%scl_package libev} + +%global source_dir %{_datadir}/%{name}-source +%global inst_srcdir %{buildroot}/%{source_dir} + +Name: %{?scl:%scl_prefix}libev +Summary: High-performance event loop/event model with lots of features +Version: 4.15 +Release: 6%{?dist} +License: BSD or GPLv2+ +URL: http://software.schmorp.de/pkg/libev.html +Source0: http://dist.schmorp.de/libev/Attic/libev-%{version}.tar.gz + +BuildRequires: autoconf automake libtool +%{?scl:Requires:%scl_runtime} + +Patch0: libev-4.15-Modernize-the-configure.ac.patch +Patch1: libev-4.15-Respect-the-CFLAGS-if-defined.patch +Patch2: libev-4.15-passenger40-soname.patch + +%description +Libev is modeled (very loosely) after libevent and the Event Perl +module, but is faster, scales better and is more correct, and also more +featureful. And also smaller. + + +%package devel +Summary: Development headers for libev +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains the development headers and libraries for libev. + + +%package libevent-devel +Summary: Compatibility development header with libevent for %{name}. +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +# The event.h file actually conflicts with the one from libevent-devel +Conflicts: libevent-devel + +%description libevent-devel +This package contains a development header to make libev compatible with +libevent. + + +%package source +Summary: High-performance event loop/event model with lots of features +%if 0%{?fedora} >= 12 || 0%{?rhel} > 5 +BuildArch: noarch +%endif + +%description source +This package contains the source code for libev. + + +%prep +%setup -q %{?scl:-n %{pkg_name}-%{version}} + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +autoreconf --install --symlink --force + +%build +export CFLAGS='%optflags -fno-strict-aliasing' +%configure --disable-static --with-pic +LDFLAGS="-release passenger40"; export LDFLAGS; +make %{?_smp_mflags} + + +%check +make check + + +%install +make install DESTDIR=%{buildroot} INSTALL="install -p" + +rm -rf %{buildroot}%{_libdir}/libev.la + +# Make the source package +mkdir -p %{inst_srcdir} + +find . -type f | grep -E '.*\.(c|h|am|ac|inc|m4|h.in|man.pre|pl|txt)$' | xargs tar cf - | (cd %{inst_srcdir} && tar xf -) +install -p -m 0644 Changes ev.pod LICENSE README %{inst_srcdir} + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + +%files +%doc Changes LICENSE README +%{_libdir}/libev*.so.* + +%files devel +%{_includedir}/ev++.h +%{_includedir}/ev.h +%{_libdir}/libev*.so +%{_mandir}/man?/* + +%files libevent-devel +%{_includedir}/event.h + +%files source +%{source_dir} + + +%changelog +* Tue Jan 27 2015 Jan Kaluza - 4.15-6 +- build with -fno-strict-aliasing + +* Thu Jan 22 2015 Jan Kaluza - 4.15-5 +- use -release passenger40 for soname + +* Tue Nov 26 2013 Mathieu Bridon - 4.15-3 +- Get the package closer to what upstream intended: + - Do not move the headers into a subfolder of /usr/include + - Make a libev-libevent-devel subpackage to contain the libevent + compatibility header, so that only this subpackage conflicts with + libevent-devel, not all of libev-devel + - Drop the pkgconfig file, as upstream rejected it several times already. + +* Sun Sep 8 2013 Igor Gnatenko - 4.15-2 +- Bump (koji was broken) + +* Sun Sep 8 2013 Igor Gnatenko - 4.15-1 +- Update to 4.15 (rhbz 987489) +- Fix dates in spec + +* Sat Aug 03 2013 Fedora Release Engineering - 4.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 08 2013 Mathieu Bridon - 4.11-2 +- Make a patch out of Michal's pkgconfig support. +- Modernize the configure.ac file for Automake >= 1.13. +- Respect the Fedora CFLAGS + https://bugzilla.redhat.com/show_bug.cgi?id=908096 + +* Fri Sep 28 2012 Mathieu Bridon - 4.11-1 +- Update to 4.11 + +* Thu Jul 19 2012 Fedora Release Engineering - 4.04-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 4.04-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Aug 9 2011 Tom Callaway - 4.04-1 +- move man page +- cleanup spec +- update to 4.04 + +* Mon Jun 13 2011 Matěj Cepl - 4.03-2 +- EL5 cannot have noarch subpackages. + +* Sat Feb 5 2011 Michal Nowak - 4.03-1 +- 4.03; RHBZ#674022 +- add a -source subpackage (Mathieu Bridon); RHBZ#672153 + +* Mon Jan 10 2011 Michal Nowak - 4.01-1 +- 4.01 +- fix grammar in %%description + +* Sat Jan 2 2010 Michal Nowak - 3.90-1 +- 3.9 + +* Mon Aug 10 2009 Michal Nowak - 3.80-1 +- 3.8 +- always use the most recent automake +- BuildRequires now libtool + +* Fri Jul 24 2009 Fedora Release Engineering - 3.70-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 17 2009 Michal Nowak - 3.70-2 +- spec file change, which prevented uploading most recent tarball + so the RPM was "3.70" but tarball was from 3.60 + +* Fri Jul 17 2009 Michal Nowak - 3.70-1 +- v3.7 +- list libev soname explicitly + +* Mon Jun 29 2009 Michal Nowak - 3.60-1 +- previous version was called "3.6" but this is broken update + path wrt version "3.53" -- thus bumping to "3.60" + +* Thu Apr 30 2009 Michal Nowak - 3.6-1 +- 3.60 +- fixed few mixed-use-of-spaces-and-tabs warnings in spec file + +* Thu Mar 19 2009 Michal Nowak - 3.53-1 +- 3.53 + +* Wed Feb 25 2009 Fedora Release Engineering - 3.52-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jan 07 2009 Michal Nowak - 3.52-1 +- 3.52 + +* Wed Dec 24 2008 Michal Nowak - 3.51-1 +- 3.51 + +* Thu Nov 20 2008 Michal Nowak - 3.49-1 +- version bump: 3.49 + +* Sun Nov 9 2008 Michal Nowak - 3.48-1 +- version bump: 3.48 + +* Mon Oct 6 2008 kwizart - 3.44-1 +- bump to 3.44 + +* Tue Sep 2 2008 kwizart - 3.43-4 +- Fix pkgconfig support + +* Tue Aug 12 2008 Michal Nowak - 3.43-2 +- removed libev.a +- installing with "-p" +- event.h is removed intentionaly, because is there only for + backward compatibility with libevent + +* Mon Aug 04 2008 Michal Nowak - 3.43-1 +- initial package +