Skip to content

Commit 5a5db6a

Browse files
committed
Remove unnecessary files and packaging commands
No point in building the files and removing or moving them.
1 parent b5dd9b1 commit 5a5db6a

2 files changed

Lines changed: 4 additions & 27 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,13 @@ install(
7575
)
7676

7777
install(
78-
FILES ${CMAKE_SOURCE_DIR}/conf/gridftp.conf ${CMAKE_CURRENT_BINARY_DIR}/conf/gridftp-inetd.conf ${CMAKE_SOURCE_DIR}/conf/gridftp-debug.conf ${CMAKE_SOURCE_DIR}/conf/replica-map.conf
78+
FILES ${CMAKE_CURRENT_BINARY_DIR}/conf/gridftp-inetd.conf ${CMAKE_SOURCE_DIR}/conf/gridftp-debug.conf ${CMAKE_SOURCE_DIR}/conf/replica-map.conf
7979
DESTINATION ${SYSCONF_INSTALL_DIR}/gridftp-hdfs
8080
)
8181

8282
install(
83-
FILES ${CMAKE_CURRENT_BINARY_DIR}/scripts/init/gridftp-hdfs
84-
DESTINATION ${SYSCONF_INSTALL_DIR}/init.d/
85-
)
86-
87-
install(
88-
FILES ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs-environment-bootstrap
89-
DESTINATION ${SYSCONF_INSTALL_DIR}/sysconfig/gridftp.conf.d
83+
FILES ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs
84+
DESTINATION ${SYSCONF_INSTALL_DIR}/sysconfig
9085
)
9186

9287
install(

conf/gridftp-hdfs.spec

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ URL: https://github.com/opensciencegrid/gridftp_hdfs
1515
# git archive --prefix=%{name}-%{version}/ %{gitrev} | gzip -n > %{name}-%{version}-%{gitrev}.tar.gz
1616
Source0: %{name}-%{version}%{?gitrev:-%{gitrev}}.tar.gz
1717

18-
Source1: globus-gridftp-server-plugin.osg-sysconfig
19-
Source2: %{name}.conf
20-
Source3: %{name}.osg-extensions.conf
21-
2218
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
2319

2420
BuildRequires: cmake
@@ -70,20 +66,6 @@ rm -rf $RPM_BUILD_ROOT
7066

7167
make DESTDIR=$RPM_BUILD_ROOT install
7268

73-
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.d
74-
75-
# Remove the init script - in GT5.2, this gets bootstrapped appropriately
76-
rm $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
77-
rm $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridftp.conf.d/%{name}-environment-bootstrap
78-
79-
mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridftp.conf.d/%{name} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
80-
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridftp.conf.d
81-
rm $RPM_BUILD_ROOT%{_sysconfdir}/gridftp-hdfs/gridftp.conf
82-
mkdir -p $RPM_BUILD_ROOT/usr/share/osg/sysconfig
83-
install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT/usr/share/osg/sysconfig/globus-gridftp-server-plugin
84-
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.d
85-
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.d
86-
8769
%clean
8870
rm -rf $RPM_BUILD_ROOT
8971

@@ -119,7 +101,7 @@ fi
119101
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
120102
%config(noreplace) %{_sysconfdir}/gridftp.d/%{name}.conf
121103
%config(noreplace) %{_sysconfdir}/gridftp.d/%{name}.osg-extensions.conf
122-
/usr/share/osg/sysconfig/globus-gridftp-server-plugin
104+
%{_datarootdir}/osg/sysconfig/globus-gridftp-server-plugin
123105

124106
%changelog
125107
* Thu Aug 24 2017 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.0-1

0 commit comments

Comments
 (0)