|
|
Update of /cvs/dist/rpms/dlm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv518
Modified Files:
dlm.spec sources
Log Message:
Merged with RHEL-4.
Index: dlm.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm/devel/dlm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dlm.spec 4 Mar 2005 17:28:44 -0000 1.9
+++ dlm.spec 20 Apr 2005 18:31:14 -0000 1.10
@@ -1,7 +1,7 @@
###############################################################################
###############################################################################
##
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+## Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
##
## This copyrighted material is made available to anyone wishing to use,
## modify, copy, or redistribute it subject to the terms and conditions
@@ -9,20 +9,21 @@
##
###############################################################################
###############################################################################
+%define subversion pre21
+
Name: dlm
Version: 1.0
-Release: 0.pre10.5
+Release: 0.pre21.2
License: GPL
Group: System Environment/Kernel
Summary: dlm - The Distributed Lock Manager
BuildRequires: dlm-kernheaders
Conflicts: GFS <= 6.0
Conflicts: GFS-modules
-Requires: dlm-kernel >= 2.6.9
+Requires: dlm-kernel >= 2.6.11
Requires: cman
-ExcludeArch: s390 s390x ppc
-Source0: %{name}-%{version}-pre10.tar.gz
-
+ExclusiveArch: i386 ia64 x86_64
+Source0: %{name}-%{version}-%{subversion}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
@@ -36,10 +37,13 @@
dlm - The Distributed Lock Manager userland libraries
%prep
-%setup -q -n %{name}-%{version}-pre10
+%setup -q -n %{name}-%{version}-%{subversion}
%build
./configure --libdir=%{_libdir} --incdir=%{_includedir} --mandir=%{_mandir}
+sed -i '/RELEASE_MAJOR/s/= .*/= %version/' make/defines.mk
+sed -i '/RELEASE_MINOR/s/= .*/= 0.%{subversion}/' make/defines.mk
+sed -i '/RELEASE /s/= .*/= %version-0.%{subversion}/' make/defines.mk
make
%install
@@ -51,8 +55,8 @@
%files
%defattr(-,root,root,-)
-%{_libdir}/libdlm.so.%{version}-pre10
-%{_libdir}/libdlm_lt.so.%{version}-pre10
+%{_libdir}/libdlm.so.%{version}.0.%{subversion}
+%{_libdir}/libdlm_lt.so.%{version}.0.%{subversion}
%doc
%files devel
@@ -61,29 +65,34 @@
%{_libdir}/libdlm.a
%{_libdir}/libdlm_lt.a
-%doc
-
%changelog
* Mon Dec 20 2004 Chris Feist <cfeist@xxxxxxxxxx>
- various bug fixes (new upstream sources)
+
* Fri Dec 10 2004 Chris Feist <cfeist@xxxxxxxxxx>
- various bug fixes (new upstream sources)
+
* Thu Nov 18 2004 Chris Feist <cfeist@xxxxxxxxxx>
- various bug fixes (new upstream sources)
+
* Mon Oct 25 2004 Chris Feist <cfeist@xxxxxxxxxx>
- various bug fixes (new upstream sources)
+
* Fri Oct 22 2004 Chris Feist <cfeist@xxxxxxxxxx>
- various bug fixes (new upstream sources)
+
* Mon Aug 16 2004 Jon Brassow <jbrassow@xxxxxxxxxx>
- add requires field
+
* Fri Aug 13 2004 Jon Brassow <jbrassow@xxxxxxxxxx>
- various bug fixes (new upstream sources)
- no need for fpic patch
+
* Wed Jul 14 2004 Jon Brassow <jbrassow@xxxxxxxxxx>
- add Makefile patch
+
* Wed Jul 14 2004 Jon Brassow <jbrassow@xxxxxxxxxx>
- explicitly name lib file
+
* Thu Jun 17 2004 Jon Brassow <jbrassow@xxxxxxxxxx>
- Initial build.
-
-
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dlm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 21 Dec 2004 21:54:21 -0000 1.5
+++ sources 20 Apr 2005 18:31:14 -0000 1.6
@@ -1 +1 @@
-54f82597c0cd25b533eb303b690647fa dlm-1.0-pre10.tar.gz
+9b3745ba3af286dab6a43c3730458577 dlm-1.0-pre21.tar.gz
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|