View | Details | Raw Unified
Collapse All | Expand All

(-)mdadm.spec (-7 / +15 lines)
 Lines 2-8    Link Here 
2
2
3
Name: mdadm
3
Name: mdadm
4
Version: 2.6
4
Version: 2.6
5
Release: alt2
5
Release: alt3
6
6
7
Summary: A tool for managing Soft RAID under Linux
7
Summary: A tool for managing Soft RAID under Linux
8
License: GPL
8
License: GPL
 Lines 14-21    Link Here 
14
Source2: raidtabtomdadm.sh
14
Source2: raidtabtomdadm.sh
15
Source3: rc.sysinit-mdassemble.patch
15
Source3: rc.sysinit-mdassemble.patch
16
Source4: %name.conf
16
Source4: %name.conf
17
Patch0: %name-2.5-alt-no_strict_aliasing.patch
18
Patch1: %name-2.5-alt-sha1sources.patch
19
Patch2: %name-2.5.5-alt-asprintf.patch
17
Patch2: %name-2.5.5-alt-asprintf.patch
20
Patch3: %name-2.6-alt-nowarn.patch
18
Patch3: %name-2.6-alt-nowarn.patch
21
19
 Lines 24-32    Link Here 
24
22
25
%if_without dietlibc
23
%if_without dietlibc
26
%define mdassemble_binary mdassemble.static
24
%define mdassemble_binary mdassemble.static
25
%define prot_flag %nil
27
26
28
%else
27
%else
29
%define mdassemble_binary mdassemble
28
%define mdassemble_binary mdassemble
29
%if %__gcc_version_major > 3
30
%define prot_flag -fno-stack-protector
31
%else
32
%define prot_flag %nil
33
%endif
30
34
31
%ifarch x86_64
35
%ifarch x86_64
32
BuildPreReq: dietlibc >= 0.30-alt1.1
36
BuildPreReq: dietlibc >= 0.30-alt1.1
 Lines 71-85    Link Here 
71
75
72
%prep
76
%prep
73
%setup -q
77
%setup -q
74
%patch0 -p1
75
#patch1 -p1
76
%patch2 -p1
78
%patch2 -p1
77
%patch3 -p1
79
%patch3 -p1
78
%__cp -au %SOURCE2 %SOURCE3 .
80
%__cp -au %SOURCE2 %SOURCE3 .
79
81
80
%build
82
%build
81
%make_build %mdassemble_binary CXFLAGS="%optflags" MDASSEMBLE_AUTO=1 SYSCONFDIR="%_sysconfdir"
83
%make_build %mdassemble_binary CXFLAGS="%optflags -fno-strict-aliasing %prot_flag" SYSCONFDIR="%_sysconfdir" MDASSEMBLE_AUTO=1
82
%make_build CXFLAGS="%optflags" SYSCONFDIR="%_sysconfdir"
84
%make_build                    CXFLAGS="%optflags -fno-strict-aliasing"            SYSCONFDIR="%_sysconfdir"
85
%make_build mdassemble.man
83
bzip2 -9fk ChangeLog
86
bzip2 -9fk ChangeLog
84
87
85
%if_with udev
88
%if_with udev
 Lines 92-97    Link Here 
92
install -pD -m740 misc/syslog-events %buildroot%_sbindir/%name-syslog-events
95
install -pD -m740 misc/syslog-events %buildroot%_sbindir/%name-syslog-events
93
install -pD -m740 %mdassemble_binary %buildroot/sbin/mdassemble
96
install -pD -m740 %mdassemble_binary %buildroot/sbin/mdassemble
94
install -pD -m600 %SOURCE4 %buildroot%_sysconfdir/%name.conf
97
install -pD -m600 %SOURCE4 %buildroot%_sysconfdir/%name.conf
98
install -pD -m644 mdassemble.man %buildroot%_man8dir/mdassemble.8
95
%if_with udev
99
%if_with udev
96
%__touch %buildroot%pre_udev_conf
100
%__touch %buildroot%pre_udev_conf
97
%endif
101
%endif
 Lines 132-137    Link Here 
132
%doc TODO ChangeLog.bz2 %name.conf-example ANNOUNCE-%version
136
%doc TODO ChangeLog.bz2 %name.conf-example ANNOUNCE-%version
133
137
134
%changelog
138
%changelog
139
* Mon Jan 29 2007 Ilya Evseev <evseev@altlinux.ru> 2.6-alt3
140
- mdassemble bugfixes 10357 (dietlibc crash), 10727 (missing manpage)
141
- remove patches #0, #1
142
135
* Wed Jan 24 2007 Ilya Evseev <evseev@altlinux.ru> 2.6-alt2
143
* Wed Jan 24 2007 Ilya Evseev <evseev@altlinux.ru> 2.6-alt2
136
- fixed x86_64 problems
144
- fixed x86_64 problems
137
145