rpms/openais/F-12 .cvsignore, 1.20, 1.21 openais.spec, 1.51, 1.52 sources, 1.21, 1.22

[Fabio M. Di Nitto]

Author: fabbione

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 Sep 2009 09:55:19 -0000	1.20
+++ .cvsignore	7 Dec 2009 07:15:24 -0000	1.21
@@ -1 +1 @@
-openais-1.1.0.tar.gz
+openais-1.1.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-12/openais.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- openais.spec	25 Sep 2009 09:55:19 -0000	1.51
+++ openais.spec	7 Dec 2009 07:15:24 -0000	1.52
@@ -2,12 +2,12 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
-Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
+Source0: http://www.osdl.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
@@ -20,7 +20,6 @@ Conflicts: openais-devel <= 0.89
 BuildRequires: corosynclib-devel >= 1.0.0-1
 
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -30,7 +29,7 @@ BuildRequires: autoconf automake
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n openais-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -57,7 +56,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the openais service handlers, default configuration
 files and init script.
 
@@ -73,7 +72,7 @@ fi
 %postun
 [ "$1" -ge "1" ] && %{_initrddir}/openais condrestart &>/dev/null || :
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
 %dir %{_sysconfdir}/corosync
@@ -97,10 +96,10 @@ fi
 %package -n openaislib
 Summary: The openais Standards-Based Cluster Framework libraries
 Group: System Environment/Libraries
-Conflicts: openais < 0.91-6
+Requires: %{name} = %{version}-%{release}
 
 %description -n openaislib
-This package contains openais libraries. 
+This package contains openais libraries.
 
 %files -n openaislib
 %defattr(-,root,root,-)
@@ -150,6 +149,13 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release.
+- spec file updates:
+  * Cleanup macro usage
+  * Drop Conflict: in favour of correct Requires:
+  * Whitespace cleanup
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 09:55:19 -0000	1.21
+++ sources	7 Dec 2009 07:15:24 -0000	1.22
@@ -1 +1 @@
-6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz
+51cf8d1633fb7b4fd1f2457ca62b4475  openais-1.1.1.tar.gz