Changeset 2371 for trunk/server
- Timestamp:
- Feb 10, 2013, 4:52:34 AM (12 years ago)
- Location:
- trunk/server
- Files:
-
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/Makefile
r2363 r2371 40 40 server_url = "http://web.mit.edu/scripts/src" 41 41 server_arch = "fedora.stable" 42 openafs_url = "http:// dl.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-1.src.rpm"42 openafs_url = "http://www.openafs.org/dl/openafs/candidate/1.6.2pre3/openafs-1.6.2-0.pre3.src.rpm" 43 43 zephyr_url = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz" 44 44 -
trunk/server/fedora/specs/openafs.spec.patch
r2337 r2371 2 2 +++ openafs.spec 2012-11-10 12:45:48.679334955 -0500 3 3 @@ -4,7 +4,7 @@ 4 %define pkgvers 1.6. 14 %define pkgvers 1.6.2 5 5 # for beta/rc releases make pkgrel 0.<tag> 6 6 # for real releases make pkgrel 1 (or more for extra releases) 7 -%define pkgrel 18 +%define pkgrel 1.99.scripts.%{scriptsversion}7 -%define pkgrel 0.pre3 8 +%define pkgrel 0.pre3.99.scripts.%{scriptsversion} 9 9 10 10 %{!?fedorakmod: %define fedorakmod 1} 11 11 %{!?build_dkmspkg: %define build_dkmspkg 1} 12 @@ -249,9 +249,1 7@@12 @@ -249,9 +249,15 @@ 13 13 %if %{build_modules} 14 14 BuildRequires: kernel-devel … … 19 19 20 20 +Patch1000: openafs-scripts.patch 21 +Patch1001: openafs-systemd-remote-fs.patch22 21 +Patch1002: openafs-systemd-crond.patch 23 22 +Patch1003: openafs-systemd-csdb.patch 24 +Patch1004: openafs-linux-support.patch25 23 +%define _default_patch_fuzz 2 26 24 + … … 28 26 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 29 27 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 30 @@ -331,6 +33 9,7 @@28 @@ -331,6 +337,7 @@ 31 29 %if %{build_userspace} 32 30 … … 36 34 %if 0%{?fedora} >= 15 37 35 Requires: systemd-units 38 @@ -403,6 +41 2,7 @@36 @@ -403,6 +410,7 @@ 39 37 40 38 %if %{build_authlibs} … … 44 42 Group: Networking/Filesystems 45 43 46 @@ -419,6 +42 9,7 @@44 @@ -419,6 +427,7 @@ 47 45 %endif 48 46 … … 52 50 Requires: openafs-authlibs = %{version}-%{release} 53 51 %endif 54 @@ -437,6 +44 8,7 @@52 @@ -437,6 +446,7 @@ 55 53 libraries. 56 54 … … 60 58 Group: Development/Filesystems 61 59 Requires: openafs = %{version}-%{release} 62 @@ -466,6 +47 8,7 @@60 @@ -466,6 +476,7 @@ 63 61 administrators. 64 62 … … 68 66 Group: Networking/Filesystems 69 67 Provides: openafs-kernel = %{version} 70 @@ -515,6 +52 8,7 @@68 @@ -515,6 +526,7 @@ 71 69 72 70 %if %{krb5support} … … 76 74 Requires: openafs = %{version} 77 75 Group: Networking/Filesystems 78 @@ -541,7 +55 5,7 @@76 @@ -541,7 +553,7 @@ 79 77 %if %{build_modules} 80 78 … … 85 83 %else 86 84 87 @@ -698,6 +71 2,13@@85 @@ -698,6 +710,11 @@ 88 86 #%setup -q -n %{srcdir} 89 87 %setup -q -b 1 -n %{srcdir} … … 91 89 +# Apply the Scripts patch 92 90 +%patch1000 -p1 -b .scripts 93 +%patch1001 -p1 -b .systemd-remote-fs94 91 +%patch1002 -p1 -b .systemd-crond 95 92 +%patch1003 -p1 -b .systemd-csdb 96 +%patch1004 -p1 -b .end-writeback97 93 + 98 94 ############################################################################## 99 95 # 100 96 # building 101 @@ -869,6 +8 90,8 @@97 @@ -869,6 +886,8 @@ 102 98 %endif 103 99 %endif … … 108 104 --prefix=%{_prefix} \ 109 105 --libdir=%{_libdir} \ 110 @@ -1278,6 +1 301,13 @@106 @@ -1278,6 +1297,13 @@ 111 107 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so 112 108 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset
for help on using the changeset viewer.