r2315 - in branches/1.1: . redhat

[ssm at projects.linpro.no]

Author: ssm
Date: 2007-12-20 10:54:16 +0100 (Thu, 20 Dec 2007)
New Revision: 2315

Modified:
   branches/1.1/
   branches/1.1/redhat/varnish.spec
Log:
Merged revisions 2313-2314 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2313 | ssm | 2007-12-20 10:43:37 +0100 (Thu, 20 Dec 2007) | 1 line
  
  redhat packaging: add version number change perfomed in branches/1.1 to trunk as well
........
  r2314 | ssm | 2007-12-20 10:50:07 +0100 (Thu, 20 Dec 2007) | 4 lines
  
  Red hat packaging, updated spec file
  * Bumped version and release numbers
  * Added build dependency for libxslt, for xsltproc
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310,2313-2314

Modified: branches/1.1/redhat/varnish.spec
===================================================================
--- branches/1.1/redhat/varnish.spec	2007-12-20 09:50:07 UTC (rev 2314)
+++ branches/1.1/redhat/varnish.spec	2007-12-20 09:54:16 UTC (rev 2315)
@@ -1,13 +1,13 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.1.1
-Release: 1%{?dist}
+Version: 1.1.2
+Release: 1
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel 
+BuildRequires: ncurses-devel automake autoconf libtool libxslt
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
 Requires(pre): shadow-utils
@@ -50,7 +50,7 @@
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
-# ./autogen.sh
+./autogen.sh
 
 %build
 
@@ -121,7 +121,6 @@
 %defattr(-,root,root,-)
 %{_libdir}/libvarnish.so
 %{_libdir}/libvarnishapi.so
-%{_libdir}/libvarnishcompat.so
 %{_libdir}/libvcl.so
 %{_includedir}/varnish/shmlog.h
 %{_includedir}/varnish/shmlog_tags.h
@@ -165,16 +164,18 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 20 2007 Stig Sandbeck Mathisen <ssm at linpro.no> - 1.1.2-1
+- Bumped the version number to 1.1.2.
+- Addeed build dependency on libxslt
+
 * Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
 - Bumped the version number to 1.1.1.
+
 * Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
 - Update for 1.1 branch
 - Added the devel package for the header files and static library files
 - Added a varnish user, and fixed the init script accordingly
 
-* Thu Jul 05 2007 Dag-Erling Smørgrav <des at linpro.no> - 1.1-1
-- Bump Version and Release for 1.1
-
 * Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
 - Fixed initrc-script bug only visible on el4 (fixes #107)