From 09119d0164eb75ebe5836cafa3218d3adbce67a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 20 Nov 2012 14:15:53 +0000 Subject: [PATCH] Packaging cleanup when publishing to Fedora: - chrpath in lbjp-common.trio not needed - chrpath in lbjp-common.gss not needed - small cleanups in lbjp-common.gss packaging --- org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec | 10 +++------- org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec | 2 -- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec index b223587..8f9f9c0 100644 --- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec +++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec @@ -13,8 +13,6 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-c BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: c-ares-devel -BuildRequires: c-ares -BuildRequires: chrpath BuildRequires: cppunit-devel %if %{?gssapi_provider_kerberos:0} BuildRequires: globus-common-devel @@ -57,10 +55,9 @@ library. %build /usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=%{_lib} --project=emi --module lbjp-common.gss if [ "%gssapi_provider_kerberos" == "1" ]; then - echo Kerberos - echo "gssapi_provider=kerberos" >> Makefile.inc - echo "GLOBUS_COMMON_CFLAGS=`pkg-config --cflags globus-common`" >> Makefile.inc - echo "GLOBUS_COMMON_LIBS=`pkg-config --libs globus-common`" >> Makefile.inc + echo "gssapi_provider=kerberos" >> Makefile.inc + echo "GLOBUS_COMMON_CFLAGS=`pkg-config --cflags globus-common`" >> Makefile.inc + echo "GLOBUS_COMMON_LIBS=`pkg-config --libs globus-common`" >> Makefile.inc fi make @@ -76,7 +73,6 @@ mkdir -p $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \; find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \; -find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH' %clean rm -rf $RPM_BUILD_ROOT diff --git a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec index ef0682e..e2ae4d0 100644 --- a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec +++ b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec @@ -11,7 +11,6 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-c BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cppunit-devel -BuildRequires: chrpath BuildRequires: libtool BuildRequires: pkgconfig @@ -48,7 +47,6 @@ mkdir -p $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \; find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \; -find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH' %clean -- 1.8.2.3