Committed 2559
Fabio
Steven Dake wrote:
> looks good
>
> On Tue, 2009-12-01 at 12:02 +0100, Fabio M. Di Nitto wrote:
>> - use %global instead of %define
>> - clean up to use %{name} instead of hardcoded corosync
>> - drop postun snippet. With the new logic of "wait forever" to shutdown,
>> we cannot reload automatically during an upgrade. This could deadlock
>> the upgrade process by waiting forever on corosync to stop. We have to
>> delegate the restart process to the user, that will do it when ready.
>> - fix Conflicts vs Requires in corosynclib. This fixes 2 issues at once.
>> First Conflicts are suboptimal, second we need corosync to make anything
>> useful out of the library.
>>
>> Fabio
>> plain text document attachment (corosync_spec_cleanup.diff)
>> Index: corosync.spec.in
>> ===================================================================
>> --- corosync.spec.in (revision 2558)
>> +++ corosync.spec.in (working copy)
>> @@ -1,4 +1,4 @@
>> -%define alphatag @alphatag@
>> +%global alphatag @alphatag@
>>
>> Name: corosync
>> Summary: The Corosync Cluster Engine and Application Programming Interfaces
>> @@ -7,7 +7,7 @@
>> License: BSD
>> Group: System Environment/Base
>> URL: http://www.openais.org
>> -Source0:
>> http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
>> +Source0:
>> http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
>>
>> # Runtime bits
>> Requires: corosynclib = %{version}-%{release}
>> @@ -16,6 +16,8 @@
>> Requires(preun): /sbin/chkconfig
>> Conflicts: openais <= 0.89, openais-devel <= 0.89
>>
>> +# Build bits
>> +
>> %define buildtrunk 0
>> %{?_with_buildtrunk: %define buildtrunk 1}
>>
>> @@ -28,7 +30,7 @@
>> BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>>
>> %prep
>> -%setup -q -n corosync-%{version}
>> +%setup -q -n %{name}-%{version}
>>
>> %if %{buildtrunk}
>> ./autogen.sh
>> @@ -73,9 +75,6 @@
>> /sbin/chkconfig --del corosync || :
>> fi
>>
>> -%postun
>> -[ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
>> -
>> %files
>> %defattr(-,root,root,-)
>> %doc LICENSE SECURITY
>> @@ -112,7 +111,7 @@
>> %package -n corosynclib
>> Summary: The Corosync Cluster Engine Libraries
>> Group: System Environment/Libraries
>> -Conflicts: corosync < 0.92-7
>> +Requires: %{name} = %{version}-%{release}
>>
>> %description -n corosynclib
>> This package contains corosync libraries.
>> _______________________________________________
>> Openais mailing list
>> [email protected]
>> https://lists.linux-foundation.org/mailman/listinfo/openais
>
> _______________________________________________
> Openais mailing list
> [email protected]
> https://lists.linux-foundation.org/mailman/listinfo/openais
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
