Skip to content

Commit 1f2d832

Browse files
authored
Merge pull request #90 from matyasselmeci/pr/dont-package-grid-security-certificates
Don't package /etc/grid-security/certificates
2 parents c713e86 + 4fe5f28 commit 1f2d832

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

packaging/debian/globus-gsi-sysconfig/debian/changelog.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
globus-gsi-sysconfig (9.2-2+gct.@distro@) @distro@; urgency=medium
2+
3+
* Don't package /etc/grid-security/certificates
4+
5+
-- Frank Scheiner <[email protected]> Tue, 27 Aug 2019 14:25:43 +0200
6+
17
globus-gsi-sysconfig (9.2-1+gct.@distro@) @distro@; urgency=medium
28

39
* Doxygen fixes
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
debian/tmp/usr/lib/*/libglobus_gsi_sysconfig.so.*
22
debian/tmp/etc/grid-security
3-
debian/tmp/etc/grid-security/certificates

packaging/debian/globus-gsi-sysconfig/debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ install: build-stamp
7777
rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE
7878

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

8282
binary: binary-arch binary-indep
8383

packaging/fedora/globus-gsi-sysconfig.spec

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Name: globus-gsi-sysconfig
44
%global soname 1
55
%global _name %(echo %{name} | tr - _)
66
Version: 9.2
7-
Release: 1%{?dist}
7+
Release: 2%{?dist}
88
Summary: Grid Community Toolkit - Globus GSI System Config Library
99

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

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

118118
%check
119119
make %{?_smp_mflags} check VERBOSE=1
@@ -126,7 +126,6 @@ make %{?_smp_mflags} check VERBOSE=1
126126
%defattr(-,root,root,-)
127127
%{_libdir}/libglobus_gsi_sysconfig.so.*
128128
%dir %{_sysconfdir}/grid-security
129-
%dir %{_sysconfdir}/grid-security/certificates
130129
%dir %{_pkgdocdir}
131130
%doc %{_pkgdocdir}/GLOBUS_LICENSE
132131

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

147146
%changelog
147+
* Wed Jun 19 2019 Mátyás Selmeci <[email protected]> - 9.2-2
148+
- Don't package /etc/grid-security/certificates
149+
148150
* Wed Nov 21 2018 Mattias Ellert <[email protected]> - 9.2-1
149151
- Doxygen fixes
150152

0 commit comments

Comments
 (0)