r1849 - in branches/1.1: . redhat

[des at projects.linpro.no]

Author: des
Date: 2007-08-16 08:52:08 +0200 (Thu, 16 Aug 2007)
New Revision: 1849

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

........
  r1846 | ingvar | 2007-08-14 23:57:58 +0200 (Tue, 14 Aug 2007) | 6 lines
  
  * 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
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846

Modified: branches/1.1/redhat/varnish.spec
===================================================================
--- branches/1.1/redhat/varnish.spec	2007-08-15 12:27:54 UTC (rev 1848)
+++ branches/1.1/redhat/varnish.spec	2007-08-16 06:52:08 UTC (rev 1849)
@@ -10,6 +10,7 @@
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -34,17 +35,16 @@
 Libraries for %{name}.
 Varnish is a high-performance HTTP accelerator.
 
-## Removed the -devel package for now
-#%package devel
-#Summary: Development libraries for %{name}
-#Group: System Environment/Libraries
-#BuildRequires: ncurses-devel
-#Requires: kernel >= 2.6.0  varnish-libs = %{version}-%{release}
-#
-#%description devel
-#Development libraries for %{name}.
-#Varnish is a high-performance HTTP accelerator
+%package libs-devel
+Summary: Development files for %{name}-libs
+Group: System Environment/Libraries
+BuildRequires: ncurses-devel
+Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 
+%description libs-devel
+Development files for %{name}-libs
+Varnish is a high-performance HTTP accelerator
+
 %prep
 %setup -q
 
@@ -55,8 +55,7 @@
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# (ie for the devel package)
-%configure --disable-static
+%configure --disable-static --localstatedir=/var/lib
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
@@ -82,8 +81,8 @@
 # None of these for fedora
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
-# Remove this line to build the devel package
-find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
+# Remove this line to build a devel package with symlinks
+#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
@@ -118,13 +117,30 @@
 %{_libdir}/*.so.*
 %doc LICENSE
 
-## Removed the -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_libdir}/libvarnish.so
-#%{_libdir}/libvarnishapi.so
-#%{_libdir}/libvcl.so
+%files libs-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvcl.so
+%{_includedir}/varnish/shmlog.h
+%{_includedir}/varnish/shmlog_tags.h
+%{_includedir}/varnish/stat_field.h
+%{_includedir}/varnish/stats.h
+%{_includedir}/varnish/varnishapi.h
+%{_libdir}/pkgconfig/varnishapi.pc
+#%{_libdir}/libvarnish.a
+#%{_libdir}/libvarnishapi.a
+#%{_libdir}/libvarnishcompat.a
+#%{_libdir}/libvcl.a
+%doc LICENSE
 
+%pre
+getent group varnish >/dev/null || groupadd -r varnish
+getent passwd varnish >/dev/null || \
+useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+    -c "Varnish http accelerator user" varnish
+exit 0
+
 %post
 /sbin/chkconfig --add varnish
 /sbin/chkconfig --add varnishlog
@@ -148,9 +164,17 @@
 %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
 * Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
 - Fixed initrc-script bug only visible on el4 (fixes #107)
 

Modified: branches/1.1/redhat/varnish.sysconfig
===================================================================
--- branches/1.1/redhat/varnish.sysconfig	2007-08-15 12:27:54 UTC (rev 1848)
+++ branches/1.1/redhat/varnish.sysconfig	2007-08-16 06:52:08 UTC (rev 1849)
@@ -17,6 +17,7 @@
 #DAEMON_OPTS="-a :6081 \
 #             -T localhost:6082 \
 #             -b localhost:8080 \
+#             -u varnish -g varnish \
 #             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
 
@@ -29,6 +30,7 @@
 DAEMON_OPTS="-a :6081 \
              -T localhost:6082 \
              -f /etc/varnish/default.vcl \
+             -u varnish -g varnish \
              -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
 
@@ -78,6 +80,7 @@
 #              -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
 #              -t ${VARNISH_TTL} \
 #              -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
+#              -u varnish -g varnish \
 #              -s ${VARNISH_STORAGE}"
 #