r1268 - branches/1.0/redhat

Fri Feb 23 00:01:29 CET 2007

Author: ingvar
Date: 2007-02-23 00:01:29 +0100 (Fri, 23 Feb 2007)
New Revision: 1268

Modified:
   branches/1.0/redhat/varnish.initrc
   branches/1.0/redhat/varnish.spec
Log:
rpmlint cleanups

Modified: branches/1.0/redhat/varnish.initrc
===================================================================

--- branches/1.0/redhat/varnish.initrc	2007-02-20 13:22:43 UTC (rev 1267)
+++ branches/1.0/redhat/varnish.initrc	2007-02-22 23:01:29 UTC (rev 1268)
@@ -38,7 +38,7 @@
 	if [ $RETVAL -eq 0 ]
 	then
 		echo_success
-		touch /var/lock/subsys/varnishd
+		touch /var/lock/subsys/varnish
 	else
 		echo_failure
 	fi
@@ -51,7 +51,7 @@
 	if [ $RETVAL -eq 0 ]
 	then
 		echo_success
-		rm -f /var/lock/subsys/varnishd
+		rm -f /var/lock/subsys/varnish
 	else
 		echo_failure
 	fi

Modified: branches/1.0/redhat/varnish.spec
===================================================================
--- branches/1.0/redhat/varnish.spec	2007-02-20 13:22:43 UTC (rev 1267)
+++ branches/1.0/redhat/varnish.spec	2007-02-22 23:01:29 UTC (rev 1268)
@@ -1,21 +1,55 @@
-Summary: Varnish is a high-performance HTTP accelerator.
+# Strange rpmlint needs...
+%define api 1.0
+%define major 1
+#%define lib_name %{name}%{api}_%{major}
+%define lib_name lib%{name}%{major}
+
+Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.0.3
-Release: 7
+Release: 1
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
-Packager: Ingvar Hagelund <ingvar at linpro.no>
+#Packager: Ingvar Hagelund <ingvar at linpro.no>
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc gcc-c++ ncurses-devel libtool autoconf automake
-Requires: gcc ncurses kernel >= 2.6.0
+Requires: gcc ncurses kernel >= 2.6.0 %{lib_name} = %version-%{release}
 Vendor: Linpro AS, http://www.linpro.no/
 
 %description
-This is the Varnish high-performance HTTP accelerator.
+This is the Varnish high-performance HTTP accelerator. Documentation
+and additional information about Varnish is available on the following
+web sites:
+
+  http://www.varnish-cache.org/         Official web site
+  http://varnish.projects.linpro.no/    Developer site and wiki
+
+Technical questions about Varnish and this release should be addressed
+to <varnish-dev at projects.linpro.no>.
+
+Questions about commercial support and services related to Varnish
+should be addressed to <varnish at linpro.no>.
+
+Copyright (c) 2006 Verdens Gang AS
+Copyright (c) 2006 Linpro AS
+All rights reserved.
+Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+
+%package -n %{lib_name}
+Summary: Varnish is a high-performance HTTP accelerator
+Group: System Environment/Daemons
+URL: http://www.varnish-cache.org/
+BuildRequires: gcc gcc-c++ ncurses-devel libtool autoconf automake
+Requires: ncurses kernel >= 2.6.0
+Vendor: Linpro AS, http://www.linpro.no/
+
+%description -n %{lib_name}
+The libraries of Varnish, the high-performance HTTP accelerator.
 Documentation and additional information about Varnish is available on
 the following web sites:
+
   http://www.varnish-cache.org/         Official web site
   http://varnish.projects.linpro.no/    Developer site and wiki
 
@@ -30,21 +64,66 @@
 All rights reserved.
 Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 
+%package -n %{lib_name}-devel
+Summary: Varnish is a high-performance HTTP accelerator
+Group: System Environment/Daemons
+URL: http://www.varnish-cache.org/
+BuildRequires: gcc gcc-c++ ncurses-devel libtool autoconf automake
+Requires: ncurses kernel >= 2.6.0  %{lib_name} = %version-%{release}
+Vendor: Linpro AS, http://www.linpro.no/
+
+%description -n %{lib_name}-devel
+Development files of Varnish, the high-performance HTTP accelerator.
+Documentation and additional information about Varnish is available on
+the following web sites:
+
+  http://www.varnish-cache.org/         Official web site
+  http://varnish.projects.linpro.no/    Developer site and wiki
+
+Technical questions about Varnish and this release should be addressed
+to <varnish-dev at projects.linpro.no>.
+
+Questions about commercial support and services related to Varnish
+should be addressed to <varnish at linpro.no>.
+
+Copyright (c) 2006 Verdens Gang AS
+Copyright (c) 2006 Linpro AS
+All rights reserved.
+Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+
 %prep
 %setup -q
+for i in varnishlog varnishtop varnishd varnishstat varnishhist varnishncsa
+do
+   iconv -f iso-8859-1 -t utf-8 < bin/$i/$i.1 > bin/$i/$i.1.utf8
+   rm -f bin/$i/$i.1
+   mv bin/$i/$i.1.utf8 bin/$i/$i.1
+done
+iconv -f iso-8859-1 -t utf-8 < man/vcl.7 > man/vcl.7.utf8
+rm -f man/vcl.7
+mv man/vcl.7.utf8 man/vcl.7
 
 %build
-rm -rf $RPM_BUILD_ROOT
-
 ./autogen.sh
 %configure --sbindir=/usr/sbin
-%{__make}
+%{__make} -j2
 
 sed -e ' s/8080/80/g ' etc/vcl.conf > redhat/vcl.conf
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %{makeinstall}
-mkdir -p %{buildroot}%{_sbindir}
+strip %{buildroot}%{_sbindir}/varnishd
+strip %{buildroot}%{_bindir}/varnishhist
+strip %{buildroot}%{_bindir}/varnishlog
+strip %{buildroot}%{_bindir}/varnishncsa
+strip %{buildroot}%{_bindir}/varnishstat
+strip %{buildroot}%{_bindir}/varnishtop
+
+strip %{buildroot}%{_libdir}/libvarnish.so.0.0.0
+strip %{buildroot}%{_libdir}/libvarnishapi.so.0.0.0
+strip %{buildroot}%{_libdir}/libvcl.so.0.0.0
+
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
 mkdir -p %{buildroot}/etc/varnish
 mkdir -p %{buildroot}/etc/init.d
@@ -72,18 +151,6 @@
 %{_bindir}/varnishncsa
 %{_bindir}/varnishstat
 %{_bindir}/varnishtop
-%{_libdir}/libvarnish.a
-%{_libdir}/libvarnish.la
-%{_libdir}/libvarnish.so.0.0.0
-%{_libdir}/libvarnish.so.0
-%{_libdir}/libvarnishapi.a
-%{_libdir}/libvarnishapi.la
-%{_libdir}/libvarnishapi.so.0.0.0
-%{_libdir}/libvarnishapi.so.0
-%{_libdir}/libvcl.a
-%{_libdir}/libvcl.la
-%{_libdir}/libvcl.so.0.0.0
-%{_libdir}/libvcl.so.0
 %{_var}/lib/varnish
 %{_mandir}/man1/varnishd.1.gz
 %{_mandir}/man1/varnishhist.1.gz
@@ -92,7 +159,6 @@
 %{_mandir}/man1/varnishstat.1.gz
 %{_mandir}/man1/varnishtop.1.gz
 %{_mandir}/man7/vcl.7.gz
-
 %doc %{_docdir}/%{name}-%{version}/INSTALL
 %doc %{_docdir}/%{name}-%{version}/LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
@@ -100,14 +166,59 @@
 %doc %{_docdir}/%{name}-%{version}/ChangeLog
 %doc %{_docdir}/%{name}-%{version}/vcl.example.conf
 %config(noreplace) /etc/varnish/vcl.conf
-%config /etc/init.d/varnish
-%config /etc/sysconfig/varnish
+%config(noreplace) /etc/sysconfig/varnish
+/etc/init.d/varnish
 
+%files -n %{lib_name}
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so.0.0.0
+%{_libdir}/libvarnish.so.0
+%{_libdir}/libvarnishapi.so.0.0.0
+%{_libdir}/libvarnishapi.so.0
+%{_libdir}/libvcl.so.0.0.0
+%{_libdir}/libvcl.so.0
+%doc %{_docdir}/%{name}-%{version}/INSTALL
+%doc %{_docdir}/%{name}-%{version}/LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/README.redhat
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+
+%files -n %{lib_name}-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.a
+%{_libdir}/libvarnish.la
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.a
+%{_libdir}/libvarnishapi.la
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvcl.a
+%{_libdir}/libvcl.la
+%{_libdir}/libvcl.so
+%doc %{_docdir}/%{name}-%{version}/INSTALL
+%doc %{_docdir}/%{name}-%{version}/LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/README.redhat
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+
 %post
 /sbin/chkconfig --add varnish
 /sbin/chkconfig --list varnish
 
+%preun
+/sbin/service varnish stop
+/sbin/chkconfig --del varnish
+
+%post -n %{lib_name}
+/sbin/ldconfig
+
+%postun -n %{lib_name}
+/sbin/ldconfig
+
 %changelog
+* Thu Feb 22 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-1
+- New release 1.0.3. See the general ChangeLog.
+- Splitted the package into varnish, libvarnish1 and
+  libvarnish1-devel, to make rpmlint happy
 * Thu Oct 19 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.02-7
 - Added a Vendor tag
 * Thu Oct 19 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.02-6


