r1871 - branches/1.1/redhat

[ingvar at projects.linpro.no]

Author: ingvar
Date: 2007-08-20 11:09:26 +0200 (Mon, 20 Aug 2007)
New Revision: 1871

Modified:
   branches/1.1/redhat/varnish.spec
Log:
reverting cosmetic changes caused by a failed diff-patch

Modified: branches/1.1/redhat/varnish.spec
===================================================================
--- branches/1.1/redhat/varnish.spec	2007-08-20 08:58:24 UTC (rev 1870)
+++ branches/1.1/redhat/varnish.spec	2007-08-20 09:09:26 UTC (rev 1871)
@@ -121,6 +121,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/libvarnish.so
 %{_libdir}/libvarnishapi.so
+%{_libdir}/libvarnishcompat.so
 %{_libdir}/libvcl.so
 %{_includedir}/varnish/shmlog.h
 %{_includedir}/varnish/shmlog_tags.h
@@ -164,17 +165,14 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-<<<<<<< .working
-* Thu Jul 05 2007 Dag-Erling Smørgrav <des at linpro.no> - 1.1-1
-- Bump Version and Release for 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
 
->>>>>>> .merge-right.r1846
+* 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)