Changeset 1693 for trunk/server/fedora/specs/openafs.spec.patch
- Timestamp:
- Oct 23, 2010, 8:07:08 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/fc13-dev (added) merged: 1613-1638,1644-1647,1649-1650,1653,1658-1666,1668-1669,1672-1678,1680-1681
- Property svn:mergeinfo changed
-
trunk/server/fedora
-
Property
svn:ignore
set to
.dload
download_stamp
rpmbuild
-
Property
svn:ignore
set to
-
trunk/server/fedora/specs/openafs.spec.patch
r1555 r1693 1 --- openafs.spec.orig 2 +++ openafs.spec 1 --- openafs.spec.orig 2010-09-10 18:21:53.000000000 -0400 2 +++ openafs.spec 2010-09-10 18:34:30.000000000 -0400 3 3 @@ -8,7 +8,7 @@ 4 4 # for beta/rc releases make pkgrel 0.X.<tag> 5 5 # for real releases make pkgrel 1 (or more for extra releases) 6 6 #%define pkgrel 0.1.rc1 7 -%define pkgrel 1.18 +%define pkgrel 1.1.99scripts.%{scriptsversion}7 -%define pkgrel 0.pre3 8 +%define pkgrel 0.pre3.99scripts.%{scriptsversion} 9 9 10 10 %if %{?osvers:0}%{!?osvers:1} 11 11 %define osvers 1 12 @@ -261,6 +261,1 1@@12 @@ -261,6 +261,10 @@ 13 13 %endif 14 14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 … … 17 17 +Patch1003: openafs-localcsdb.patch 18 18 +Patch1005: openafs-numsysnames.patch 19 +Patch1006: openafs-release-glock.patch20 19 + 21 20 # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... 22 21 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 23 22 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 24 @@ -343,6 +34 8,7 @@23 @@ -343,6 +347,7 @@ 25 24 %if %{build_userspace} 26 25 27 26 %package client 28 27 +Provides: scripts-openafs-client 29 Requires: binutils, openafs = %{ PACKAGE_VERSION}28 Requires: binutils, openafs = %{version} 30 29 31 30 %if %{fedorakmod} 32 @@ -403,6 +40 9,7 @@31 @@ -403,6 +408,7 @@ 33 32 34 33 %if %{build_authlibs} … … 38 37 Group: Networking/Filesystems 39 38 40 @@ -419,6 +42 6,7 @@39 @@ -419,6 +425,7 @@ 41 40 %endif 42 41 … … 44 43 +Provides: scripts-openafs-authlibs-devel 45 44 %if %{build_authlibs} 46 Requires: openafs-authlibs = %{ PACKAGE_VERSION}45 Requires: openafs-authlibs = %{version} 47 46 %endif 48 @@ -437,6 +44 5,7 @@47 @@ -437,6 +444,7 @@ 49 48 libraries. 50 49 … … 54 53 Group: Development/Filesystems 55 54 56 @@ -465,6 +47 4,7 @@55 @@ -465,6 +473,7 @@ 57 56 administrators. 58 57 … … 61 60 Summary: OpenAFS Kernel Module source tree 62 61 Group: Networking/Filesystems 63 Provides: openafs-kernel = %{ PACKAGE_VERSION}64 @@ -514,6 +52 4,7 @@62 Provides: openafs-kernel = %{version} 63 @@ -514,6 +523,7 @@ 65 64 66 65 %if %{krb5support} … … 68 67 +Provides: scripts-openafs-krb5 69 68 Summary: OpenAFS programs to use with krb5 70 Requires: openafs = %{ PACKAGE_VERSION}69 Requires: openafs = %{version} 71 70 Group: Networking/Filesystems 72 @@ -540,7 +55 1,7 @@71 @@ -540,7 +550,7 @@ 73 72 %if %{build_modules} 74 73 … … 79 78 %else 80 79 81 @@ -699,6 +7 10,10@@80 @@ -699,6 +709,9 @@ 82 81 83 82 # Patch openafs to build a kernel module named "openafs" instead of "libafs" … … 86 85 +%patch1003 -p1 -b .localcsdb 87 86 +%patch1005 -p1 -b .numsysnames 88 +%patch1006 -p1 -b .release-glock89 87 90 88 ############################################################################## 91 89 # 92 @@ -1209,7 +1224,7 @@93 rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*94 95 # remove man pages from programs deleted above96 -for f in 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do97 +for f in 1/compile_et 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do98 rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*99 done100 101 @@ -1569,7 +1584,6 @@102 %{_libdir}/librxstat.a103 %{_libdir}/libubik.a104 %{_mandir}/man1/rxgen.*105 -%{_mandir}/man1/compile_et.*106 107 %if %{build_dkmspkg}108 %files -n dkms-%{name}
Note: See TracChangeset
for help on using the changeset viewer.