Permalink
Browse files

Import packaging fixes from libvmod-example

  • Loading branch information...
1 parent 7c96123 commit 024a5081840535fb371d7931cced57761e60e1b1 Lasse Karstensen committed Oct 3, 2013
Showing with 7 additions and 21 deletions.
  1. +2 −0 Makefile.am
  2. +0 −12 redhat/make-tarball
  3. +5 −9 {redhat → }/vmod-curl.spec
View
@@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
+doc_DATA = README LICENSE
+
SUBDIRS = src man
View
@@ -1,12 +0,0 @@
-#!/bin/bash -x
-set -e
-BASEDIR=$(git rev-parse --show-toplevel)
-REL=$(basename $BASEDIR)
-
-#BRANCH=$(git branch | grep "*" | sed "s/* //")
-BRANCH=$(git rev-parse HEAD)
-
-RPMDIR=$(rpm --eval "%{_topdir}")
-TOFILE="$RPMDIR/SOURCES/${REL}.tar.gz"
-
-(cd $BASEDIR && git archive --prefix ${REL}/ --format tar ${BRANCH} | gzip > $TOFILE)
@@ -4,30 +4,26 @@ Version: 0.1
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
-Source0: ./libvmod-curl.tar.gz
+Source0: libvmod-curl.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# we need EPEL, or at least mhash + mhash-devel from it:
-# rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-7.noarch.rpm
Requires: varnish > 3.0
BuildRequires: make, python-docutils, curl-devel > 7.19.0
%description
-libvmod-curl
+CURL support for Varnish VCL
%prep
%setup -n libvmod-curl
%build
# this assumes that VARNISHSRC is defined on the rpmbuild command line, like this:
# rpmbuild -bb --define 'VARNISHSRC /home/user/rpmbuild/BUILD/varnish-3.0.3' redhat/*spec
-./configure VARNISHSRC=%{VARNISHSRC} VMODDIR="$(PKG_CONFIG_PATH=%{VARNISHSRC} pkg-config --variable=vmoddir varnishapi)" --prefix=/usr/
+./configure VARNISHSRC=%{VARNISHSRC} VMODDIR="$(PKG_CONFIG_PATH=%{VARNISHSRC} pkg-config --variable=vmoddir varnishapi)" --prefix=/usr/ --docdir='${datarootdir}/doc/%{name}'
make
+make check
%install
make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/usr/share/doc/%{name}/
-cp README %{buildroot}/usr/share/doc/%{name}/
-cp LICENSE %{buildroot}/usr/share/doc/%{name}/
%clean
rm -rf %{buildroot}
@@ -39,5 +35,5 @@ rm -rf %{buildroot}
%{_mandir}/man?/*
%changelog
-* Wed Oct 03 2012 Lasse Karstensen <lasse@varnish-software.com> - 0.1-0.20120918
+* Tue Nov 14 2012 Lasse Karstensen <lasse@varnish-software.com> - 0.1-0.20121114
- Initial version.

0 comments on commit 024a508

Please sign in to comment.