Logoj0ke.net Open Build Service > Projects > internetx:managed:testing > certmaster > Changes
Sign Up | Log In

Changes of Revision 2

[-] Changed certmaster.spec
x
 
1
@@ -36,7 +36,7 @@
2
 
3
 # NOTE: if you 
4
 BuildRequires: %{python}-devel
5
-%if %is_suse
6
+%if 0%{?is_suse} == 1
7
 BuildRequires: gettext-devel
8
 %else
9
 %if 0%{?fedora} >= 8
10
@@ -47,7 +47,7 @@
11
 %endif
12
 %endif
13
 %endif
14
-%if 0%{?fedora} >= 16
15
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
16
 BuildRequires: systemd-units
17
 Requires(post): systemd-sysv
18
 Requires(post): systemd-units
19
@@ -76,7 +76,7 @@
20
 touch $RPM_BUILD_ROOT/var/log/certmaster/audit.log
21
 
22
 # systemd
23
-%if 0%{?fedora} >= 16
24
+%if 0%{?fedora} >= 16  || 0%{?rhel} >= 7
25
 rm -rf $RPM_BUILD_ROOT/etc/init.d/
26
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
27
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
28
@@ -94,7 +94,7 @@
29
 %{_bindir}/certmaster-request
30
 %{_bindir}/certmaster-ca
31
 %{_bindir}/certmaster-sync
32
-%if 0%{?fedora} >= 16
33
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
34
 %{_unitdir}/certmaster.service
35
 %else
36
 /etc/init.d/certmaster
37
@@ -132,7 +132,7 @@
38
 %doc AUTHORS README LICENSE
39
 %{_mandir}/man1/*.1.gz
40
 
41
-%if 0%{?fedora} >= 16
42
+%if 0%{?fedora} >= 16  || 0%{?rhel} >= 7
43
 %post
44
 if [ $1 -eq 1 ] ; then 
45
     # Initial installation 
46
@@ -204,81 +204,3 @@
47
 
48
 
49
 %changelog
50
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-9
51
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
52
-
53
-* Thu Dec 12 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 0.28-8
54
-- https://fedoraproject.org/wiki/Changes/Remove_Python-setuptools-devel
55
-- fix bogus dates in spec
56
-
57
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-7
58
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
59
-
60
-* Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> 0.28-6
61
-- Rebuild to fix rawhide broken deps
62
-
63
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-5
64
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
65
-
66
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-4
67
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
68
-
69
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-3
70
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
71
-
72
-* Fri Sep  9 2011 Tom Callaway <spot@fedoraproject.org> - 0.28-2
73
-- systemd support for f16+
74
-
75
-* Thu Apr  7 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.28-1
76
-- 0.28
77
-
78
-* Wed Aug 25 2010 Seth Vidal <skvidal at fedoraproject.org> - 0.27-1
79
-- 0.27
80
-
81
-* Thu Jun 11 2009 Adrian Likins <alikins@redhat.com> - 0.25-1
82
-- add /etc/certmaster/func
83
-
84
-* Tue May 26 2009 Adrian Likins <alikins@redhat.com> - 0.25-1
85
-- add /var/lib/certmaster/certmaster* to spec and set perms
86
-- add /var/log/certmaster/certmaster.log,audit.log to spec
87
-  and set perms
88
-
89
-* Wed Feb 18 2009 Adrian Likins <alikins@redhat.com> - 0.24.5
90
-- remove version file
91
-
92
-* Mon Jan 19 2009 Adrian Likins <alikins@redhat.com> - 0.24.4
93
-- make inclusion of egginfo dependant on having python >= 2.5
94
-- remove need for patch on rhel3+python2.4 cases (distutils should
95
-  do all the /usr/bin/python renaming now)
96
-- minor reformatting changes
97
-
98
-* Tue Jan 06 2009 Greg Swift <gregswift@gmail.com> - 0.24-3x1
99
-- Fixed spec because it was only building in rhel3
100
-
101
-* Wed Dec 31 2008 Greg Swift <gregswift@gmail.com> - 0.24-2
102
-- Patched SPEC to build on rhel3 with python2.3
103
-- Added Patch0 to handle python2.3 if on rhel3
104
-
105
-* Fri Dec 12 2008 Adrian Likins <alikins@redhat.com> - 0.24-1
106
-- add missing dirs as per bz#473633
107
-
108
-* Fri Jun 06 2008 Adrian Likins <alikins@redhat.com> - 0.20-2
109
-- fix fedora bug #441283 - typo in postinstall scriptlet
110
-  (the init.d symlinks for runlevels 1 and 6 were created wrong)
111
-
112
-* Tue Apr 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.20-1
113
-- new release
114
-- fix changelog versions
115
-
116
-* Tue Apr 15 2008 Steve Salevan <ssalevan@redhat.com> - 0.19-3
117
-- added in trigger directories
118
-
119
-* Mon Mar 17 2008 Adrian Likins <alikins@redhat.com> - 0.19-2
120
-- removed unused minion/ and overlord/ dirs
121
-
122
-* Mon Feb 25 2008 Adrian Likins <alikins@redhat.com> - 0.19-1
123
-- remove certmasterd references
124
-
125
-* Thu Feb 7 2008 Michael DeHaan <mdehaan@redhat.com> - 0.18-1
126
-- initial version, split off from func project, WIP
127
-
128