Skip to content

Commit

Permalink
Merge pull request #90 from matyasselmeci/pr/dont-package-grid-securi…
Browse files Browse the repository at this point in the history
…ty-certificates

Don't package /etc/grid-security/certificates
  • Loading branch information
fscheiner authored Sep 6, 2019
2 parents c713e86 + 4fe5f28 commit 1f2d832
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions packaging/debian/globus-gsi-sysconfig/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globus-gsi-sysconfig (9.2-2+gct.@distro@) @distro@; urgency=medium

* Don't package /etc/grid-security/certificates

-- Frank Scheiner <[email protected]> Tue, 27 Aug 2019 14:25:43 +0200

globus-gsi-sysconfig (9.2-1+gct.@distro@) @distro@; urgency=medium

* Doxygen fixes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
debian/tmp/usr/lib/*/libglobus_gsi_sysconfig.so.*
debian/tmp/etc/grid-security
debian/tmp/etc/grid-security/certificates
2 changes: 1 addition & 1 deletion packaging/debian/globus-gsi-sysconfig/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ install: build-stamp
rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE

# Create config directory
mkdir -p $(INSTALLDIR)/etc/grid-security/certificates
mkdir -p $(INSTALLDIR)/etc/grid-security

binary: binary-arch binary-indep

Expand Down
8 changes: 5 additions & 3 deletions packaging/fedora/globus-gsi-sysconfig.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Name: globus-gsi-sysconfig
%global soname 1
%global _name %(echo %{name} | tr - _)
Version: 9.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Grid Community Toolkit - Globus GSI System Config Library

Group: System Environment/Libraries
Expand Down Expand Up @@ -113,7 +113,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la

# Create config directory
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/certificates
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security

%check
make %{?_smp_mflags} check VERBOSE=1
Expand All @@ -126,7 +126,6 @@ make %{?_smp_mflags} check VERBOSE=1
%defattr(-,root,root,-)
%{_libdir}/libglobus_gsi_sysconfig.so.*
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/certificates
%dir %{_pkgdocdir}
%doc %{_pkgdocdir}/GLOBUS_LICENSE

Expand All @@ -145,6 +144,9 @@ make %{?_smp_mflags} check VERBOSE=1
%doc %{_pkgdocdir}/GLOBUS_LICENSE

%changelog
* Wed Jun 19 2019 Mátyás Selmeci <[email protected]> - 9.2-2
- Don't package /etc/grid-security/certificates

* Wed Nov 21 2018 Mattias Ellert <[email protected]> - 9.2-1
- Doxygen fixes

Expand Down

0 comments on commit 1f2d832

Please sign in to comment.