rpms/openais/F-11 .cvsignore, 1.16, 1.17 openais.spec, 1.46, 1.47 sources, 1.18, 1.19

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4361

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Dec 2009 07:15:55 -0000	1.16
+++ .cvsignore	10 Feb 2010 16:27:32 -0000	1.17
@@ -1 +1 @@
-openais-1.1.1.tar.gz
+openais-1.1.2.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/openais.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- openais.spec	7 Dec 2009 07:15:55 -0000	1.46
+++ openais.spec	10 Feb 2010 16:27:32 -0000	1.47
@@ -1,13 +1,13 @@
-# define alphatag 0
+# global alphatag 0
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
-URL: http://developer.osdl.org/dev/openais/
-Source0: http://www.osdl.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
+URL: http://developer.osdl.org/dev/%{name}/
+Source0: http://devresources.linuxfoundation.org/dev/%{name}/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
@@ -19,8 +19,8 @@ Conflicts: openais-devel <= 0.89
 # Setup/build bits
 BuildRequires: corosynclib-devel >= 1.0.0-1
 
-%define buildtrunk 0
-%{?_with_buildtrunk: %define buildtrunk 1}
+%global buildtrunk 0
+%{?_with_buildtrunk: %global buildtrunk 1}
 
 %if %{buildtrunk}
 BuildRequires: autoconf automake
@@ -35,7 +35,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{configure}
+%{configure} \
+	--with-initddir=%{_initddir}
 
 %build
 make %{_smp_mflags}
@@ -44,8 +45,6 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_initrddir}
-install -m 755 init/redhat %{buildroot}%{_initrddir}/openais
 
 ## tree fixup
 # drop static libs
@@ -69,9 +68,6 @@ if [ $1 -eq 0 ]; then
     /sbin/chkconfig --del openais || :
 fi
 
-%postun
-[ "$1" -ge "1" ] && %{_initrddir}/openais condrestart &>/dev/null || :
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
@@ -149,6 +145,14 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jan 27 2010 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.2-1
+- New upstream release.
+- Update Source0 url
+- Cleanup install section. Init script is now installed by upstream
+- Use global instead of define
+- Use more name macro around
+- Don't deadlock between package upgrade and openais condrestart
+
 * Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
 - New upstream release.
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	7 Dec 2009 07:15:55 -0000	1.18
+++ sources	10 Feb 2010 16:27:32 -0000	1.19
@@ -1 +1 @@
-51cf8d1633fb7b4fd1f2457ca62b4475  openais-1.1.1.tar.gz
+f94ccb867358ac54ab24bc54def27335  openais-1.1.2.tar.gz