From 9f2200e8d93daa1fa4ce0db18d0780e85e23de2e Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Mon, 28 May 2012 20:01:54 +0000 Subject: [PATCH] merging branch_1_0 to HEAD. HEAD is the only branch from now. --- emi.canl.canl-c/project/canl-c.spec | 9 +++++++++ emi.canl.canl-c/project/debian.control | 2 +- emi.canl.canl-c/project/debian.libcanl-c-dev.dirs | 1 + emi.canl.canl-c/project/debian.rules | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/emi.canl.canl-c/project/canl-c.spec b/emi.canl.canl-c/project/canl-c.spec index 97fd19d..1086871 100644 --- a/emi.canl.canl-c/project/canl-c.spec +++ b/emi.canl.canl-c/project/canl-c.spec @@ -1,3 +1,5 @@ +%global is_fedora %(rpm -q --quiet fedora-release && echo 1 || echo 0) + Summary: @SUMMARY@ Name: canl-c Version: @MAJOR@.@MINOR@.@REVISION@ @@ -14,6 +16,11 @@ BuildRequires: krb5-devel%{?_isa} BuildRequires: libtool BuildRequires: openssl-devel%{?_isa} BuildRequires: pkgconfig +%if %is_fedora +BuildRequires: texlive-latex +%else +BuildRequires: tetex-latex +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: yes Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.canl.c/%{version}/src/%{name}-@VERSION@.src.tar.gz @@ -77,6 +84,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%dir /usr/share/doc/%{name}-%{version} +/usr/share/doc/%{name}-%{version}/*.pdf /usr/%{_lib}/libcanl_c.so.@MAJOR@.@MINOR@.@REVISION@ /usr/%{_lib}/libcanl_c.so.@MAJOR@ diff --git a/emi.canl.canl-c/project/debian.control b/emi.canl.canl-c/project/debian.control index 6d30543..932900d 100644 --- a/emi.canl.canl-c/project/debian.control +++ b/emi.canl.canl-c/project/debian.control @@ -2,7 +2,7 @@ Source: canl-c Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, libc-ares-dev, libkrb5-dev, libssl-dev, libtool, pkg-config +Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, libc-ares-dev, libkrb5-dev, libssl-dev, libtool, pkg-config, texlive-latex-extra Standards-Version: 3.9.1 Section: libs Homepage: @URL@ diff --git a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs index da07fdd..32562c6 100644 --- a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs +++ b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs @@ -1,2 +1,3 @@ usr/include usr/lib +usr/share/doc/canl-doc diff --git a/emi.canl.canl-c/project/debian.rules b/emi.canl.canl-c/project/debian.rules index 7a62171..162aae5 100644 --- a/emi.canl.canl-c/project/debian.rules +++ b/emi.canl.canl-c/project/debian.rules @@ -39,6 +39,10 @@ install: build-stamp rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH' + mv $(CURDIR)/debian/tmp/usr/share/doc/canl-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/canl + (cd $(CURDIR)/debian/tmp/usr/share/doc/canl; \ + rm -fv ChangeLog LICENSE; \ + cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz) binary-indep: -- 1.8.2.3