[dpm-dsi/f18] Removed devel package, and %{_isa} suffix from the globus server dependency
Alejandro Alvarez
aalvarez at fedoraproject.org
Wed Jul 17 09:18:13 UTC 2013
commit da4b1a8829b02586c2cee23956a8a09448b3c08e
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date: Mon May 6 17:29:54 2013 +0200
Removed devel package, and %{_isa} suffix from the globus server dependency
dpm-dsi.spec | 26 ++++++++++----------------
no-headers.patch | 11 +++++++++++
2 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index d6751d1..762a8b1 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -10,6 +10,9 @@ URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
# svn export http://svn.cern.ch/guest/lcgdm/dpm-dsi/tags/dpm-dsi_1_9_0 dpm-dsi-1.9.0
# tar -czvf dpm-dsi-1.9.0.tar.gz dpm-dsi-1.9.0
Source0: %{name}-%{version}.tar.gz
+# It does not make sense to provide internal header files
+# https://svnweb.cern.ch/trac/lcgdm/changeset/8789/dpm-dsi/trunk
+Patch0: no-headers.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -20,7 +23,7 @@ Requires(preun): chkconfig
Requires(preun): initscripts
Requires(post): chkconfig
Requires(postun): initscripts
-Requires: globus-gridftp-server-progs%{?_isa}
+Requires: globus-gridftp-server-progs
Provides: DPM-gridftp-server = %{version}-%{release}
Obsoletes: DPM-gridftp-server <= 1.8.1
Provides: DPM-DSI = %{version}-%{release}
@@ -39,17 +42,9 @@ Globus provides open source grid software, including a server implementation
of the GridFTP protocol. This plugin implements the DPM backend specifics
required to expose the data using this protocol.
-%package devel
-Summary: DPM GridFTP plugin development headers and libraries
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-This package contains common development libraries and header files for the
-DPM GridFTP plugin.
-
%prep
%setup -q -n %{name}-%{version}
+%patch0
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -74,11 +69,6 @@ rm -rf %{buildroot}
%{_localstatedir}/log/dpm-gsiftp
%doc LICENSE RELEASE-NOTES
-%files devel
-%defattr(-,root,root)
-%{_includedir}/dmlite_gridftp.h
-%{_includedir}/dmlite_internal.h
-
%post
/sbin/chkconfig --add dpm-gsiftp
/sbin/ldconfig
@@ -96,6 +86,10 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Mon May 06 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.0-2
+- Removed devel package
+- Removed %{?_isa} suffix from globus-gridftp-server-progs
+
* Wed Dec 19 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.9.0-1
- Update for new upstream release
diff --git a/no-headers.patch b/no-headers.patch
new file mode 100644
index 0000000..6ac00bb
--- /dev/null
+++ b/no-headers.patch
@@ -0,0 +1,11 @@
+Index: include/CMakeLists.txt
+===================================================================
+--- include/CMakeLists.txt (revision 8788)
++++ include/CMakeLists.txt (working copy)
+@@ -1,5 +1,2 @@
+ cmake_minimum_required (VERSION 2.6)
+
+-install (FILES dmlite_gridftp.h dmlite_internal.h
+- DESTINATION usr/include
+-)
+
More information about the scm-commits
mailing list