r5060 - trunk/varnish-cache/redhat

[ingvar at varnish-cache.org]

Author: ingvar
Date: 2010-07-30 15:26:48 +0200 (Fri, 30 Jul 2010)
New Revision: 5060

Modified:
   trunk/varnish-cache/redhat/varnish.spec
Log:
- Synced bits from Fedora
- Made to work with trunk again, see specfile changelog


Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2010-07-30 13:24:24 UTC (rev 5059)
+++ trunk/varnish-cache/redhat/varnish.spec	2010-07-30 13:26:48 UTC (rev 5060)
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.1.1
-Release: 0.svn20100415%{?dist}
+Version: 2.1.4
+Release: 0.svn20100730%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -88,6 +88,12 @@
 
 %build
 
+# No pkgconfig/libpcre.pc in rhel4
+%if 0%{?rhel} == 4
+	export PCRE_CFLAGS=`pcre-config --cflags`
+	export PCRE_LIBS=`pcre-config --libs` 
+%endif
+
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
@@ -99,11 +105,6 @@
 	%configure --disable-static --localstatedir=/var/lib
 %endif
 
-# Have to regenerate the docs because of patched doc/changes-2.0.6-2.1.0.xml
-pushd doc/
-make clean
-popd
-
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
@@ -183,8 +184,8 @@
 %{_bindir}/*
 %{_var}/lib/varnish
 %{_var}/log/varnish
-%{_mandir}/man1/*.1*
-%{_mandir}/man7/*.7*
+#%{_mandir}/man1/*.1*
+#%{_mandir}/man7/*.7*
 %doc INSTALL LICENSE README redhat/README.redhat ChangeLog 
 %doc examples
 %doc doc
@@ -208,11 +209,7 @@
 %{_libdir}/libvarnishcompat.so
 %{_libdir}/libvcl.so
 %dir %{_includedir}/varnish
-%{_includedir}/varnish/shmlog.h
-%{_includedir}/varnish/shmlog_tags.h
-%{_includedir}/varnish/stat_field.h
-%{_includedir}/varnish/stats.h
-%{_includedir}/varnish/varnishapi.h
+%{_includedir}/varnish/*
 %{_libdir}/pkgconfig/varnishapi.pc
 %doc LICENSE
 
@@ -251,6 +248,25 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-0.svn20100730
+- Replaced specific include files with a wildcard glob
+- The man pages seems to have vanished
+
+* Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-1
+- New upstream release
+- Add a patch for jemalloc on s390 that lacks upstream
+
+* Wed May 05 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.2-1
+- New upstream release
+- Remove patches merged upstream
+
+* Tue Apr 27 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.1.1-1
+- New upstream release
+- Added a fix for missing pkgconfig/libpcre.pc on rhel4
+- Added a patch from trunk making the rpm buildable on lowspec
+  build hosts (like Red Hat's ppc build farm nodes)
+- Removed patches that are merged upstream
+
 * Wed Apr 14 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.1.0-2
 - Added a patch from svn that fixes changes-2.0.6-2.1.0.xml