Changeset 1693 for trunk/server/fedora/specs
- Timestamp:
- Oct 23, 2010, 8:07:08 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 11 edited
- 3 copied
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/ghc-MonadCatchIO-mtl.spec
r1590 r1693 1 1 %global pkg_name MonadCatchIO-mtl 2 2 3 %bcond_without doc 4 %bcond_without prof 3 %global common_summary Haskell %{pkg_name} library 5 4 6 # ghc does not emit debug information 5 %global common_description A %{pkg_name} library for Haskell. 6 7 # add any Haskell library dependencies here: 8 %global ghc_pkg_deps ghc-mtl-devel 9 10 # add any foreign library dependencies here: 11 #%%global ghc_pkg_c_deps @CDEP1@-devel 12 13 %bcond_without shared 14 15 # debuginfo is not useful for ghc 7 16 %global debug_package %{nil} 8 17 … … 10 19 Version: 0.3.0.1 11 20 Release: 0.%{scriptsversion}%{?dist} 12 Summary: Haskell %{pkg_name} library21 Summary: %{common_summary} 13 22 14 Group: Development/Libraries23 Group: System Environment/Libraries 15 24 License: BSD 16 25 URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} … … 19 28 # fedora ghc archs: 20 29 ExclusiveArch: %{ix86} x86_64 ppc alpha 21 BuildRequires: ghc, ghc-rpm-macros 22 %if %{with doc} 23 BuildRequires: ghc-doc 24 %endif 25 %if %{with prof} 26 BuildRequires: ghc-prof 27 %endif 30 BuildRequires: ghc, ghc-doc, ghc-prof 31 BuildRequires: ghc-rpm-macros >= 0.7.0 32 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} 33 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} 28 34 29 35 %description 30 This package provides the Haskell %{pkg_name} library for ghc. 31 32 33 %package devel 34 Summary: Haskell %{pkg_name} library 35 Group: Development/Libraries 36 Requires: ghc = %{ghc_version} 37 Requires(post): ghc = %{ghc_version} 38 Requires(preun): ghc = %{ghc_version} 39 40 %description devel 41 This package contains the development files for %{name} 42 built for ghc-%{ghc_version}. 43 44 45 %if %{with doc} 46 %package doc 47 Summary: Documentation for %{name} 48 Group: Development/Libraries 49 Requires: ghc-doc = %{ghc_version} 50 Requires(post): ghc-doc = %{ghc_version} 51 Requires(postun): ghc-doc = %{ghc_version} 52 53 %description doc 54 This package contains development documentation files for 55 the %{name} library. 36 %{common_description} 37 %if %{with shared} 38 This package provides the shared library. 56 39 %endif 57 40 58 41 59 %if %{with prof} 60 %package prof 61 Summary: Profiling libraries for %{name} 62 Group: Development/Libraries 63 Requires: %{name}-devel = %{version}-%{release} 64 Requires: ghc-prof = %{ghc_version} 65 66 %description prof 67 This package contains profiling libraries for %{name} 68 built for ghc-%{ghc_version}. 69 %endif 42 %{?ghc_lib_package} 70 43 71 44 … … 75 48 76 49 %build 77 %cabal_configure --ghc %{?with_prof:-p} 78 %cabal build 79 %if %{with doc} 80 %cabal haddock 81 %endif 82 %ghc_gen_scripts 50 %ghc_lib_build 83 51 84 52 85 53 %install 86 54 rm -rf $RPM_BUILD_ROOT 87 %cabal_install 88 %ghc_install_scripts 89 %ghc_gen_filelists %{name} 55 %ghc_lib_install 90 56 91 57 … … 94 60 95 61 96 %post devel97 %ghc_register_pkg98 99 100 %if %{with doc}101 %post doc102 %ghc_reindex_haddock103 %endif104 105 106 %preun devel107 if [ "$1" -eq 0 ] ; then108 %ghc_unregister_pkg109 fi110 111 112 %if %{with doc}113 %postun doc114 if [ "$1" -eq 0 ] ; then115 %ghc_reindex_haddock116 fi117 %endif118 119 120 %files devel -f %{name}-devel.files121 %defattr(-,root,root,-)122 #%{_docdir}/%{name}-%{version}123 124 125 %if %{with doc}126 %files doc -f %{name}-doc.files127 %defattr(-,root,root,-)128 %endif129 130 131 %if %{with prof}132 %files prof -f %{name}-prof.files133 %defattr(-,root,root,-)134 %endif135 136 137 62 %changelog 138 * Mon Mar 152010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0139 - initial packaging for Fedora automatically generated by cabal2spec 63 * Thu Sep 9 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0 64 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 -
trunk/server/fedora/specs/ghc-cgi.spec
r1590 r1693 1 1 %global pkg_name cgi 2 2 3 %bcond_without doc 4 %bcond_without prof 3 %global common_summary Haskell %{pkg_name} library 5 4 6 # ghc does not emit debug information 5 %global common_description A %{pkg_name} library for Haskell. 6 7 # add any Haskell library dependencies here: 8 %global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel 9 10 # add any foreign library dependencies here: 11 #%%global ghc_pkg_c_deps @CDEP1@-devel 12 13 %bcond_without shared 14 15 # debuginfo is not useful for ghc 7 16 %global debug_package %{nil} 8 17 … … 10 19 Version: 3001.1.8.1 11 20 Release: 0.%{scriptsversion}%{?dist} 12 Summary: Haskell %{pkg_name} library21 Summary: %{common_summary} 13 22 14 Group: Development/Libraries23 Group: System Environment/Libraries 15 24 License: BSD 16 25 URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} … … 19 28 # fedora ghc archs: 20 29 ExclusiveArch: %{ix86} x86_64 ppc alpha 21 BuildRequires: ghc, ghc-rpm-macros, ghc-MonadCatchIO-mtl-devel 22 %if %{with doc} 23 BuildRequires: ghc-doc, ghc-MonadCatchIO-mtl-doc 24 %endif 25 %if %{with prof} 26 BuildRequires: ghc-prof, ghc-MonadCatchIO-mtl-prof 27 %endif 30 BuildRequires: ghc, ghc-doc, ghc-prof 31 BuildRequires: ghc-rpm-macros >= 0.7.0 32 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} 33 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} 28 34 29 35 %description 30 This package provides the Haskell %{pkg_name} library for ghc. 31 32 33 %package devel 34 Summary: Haskell %{pkg_name} library 35 Group: Development/Libraries 36 Requires: ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel 37 Requires(post): ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel 38 Requires(preun): ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel 39 40 %description devel 41 This package contains the development files for %{name} 42 built for ghc-%{ghc_version}. 43 44 45 %if %{with doc} 46 %package doc 47 Summary: Documentation for %{name} 48 Group: Development/Libraries 49 Requires: ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc 50 Requires(post): ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc 51 Requires(postun): ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc 52 53 %description doc 54 This package contains development documentation files for 55 the %{name} library. 36 %{common_description} 37 %if %{with shared} 38 This package provides the shared library. 56 39 %endif 57 40 58 41 59 %if %{with prof} 60 %package prof 61 Summary: Profiling libraries for %{name} 62 Group: Development/Libraries 63 Requires: %{name}-devel = %{version}-%{release} 64 Requires: ghc-prof = %{ghc_version}, ghc-MonadCatchIO-mtl-prof 65 66 %description prof 67 This package contains profiling libraries for %{name} 68 built for ghc-%{ghc_version}. 69 %endif 42 %{?ghc_lib_package} 70 43 71 44 … … 75 48 76 49 %build 77 %cabal_configure --ghc %{?with_prof:-p} 78 %cabal build 79 %if %{with doc} 80 %cabal haddock 81 %endif 82 %ghc_gen_scripts 50 %ghc_lib_build 83 51 84 52 85 53 %install 86 54 rm -rf $RPM_BUILD_ROOT 87 %cabal_install 88 %ghc_install_scripts 89 %ghc_gen_filelists %{name} 55 %ghc_lib_install 90 56 91 57 … … 94 60 95 61 96 %post devel97 %ghc_register_pkg98 99 100 %if %{with doc}101 %post doc102 %ghc_reindex_haddock103 %endif104 105 106 %preun devel107 if [ "$1" -eq 0 ] ; then108 %ghc_unregister_pkg109 fi110 111 112 %if %{with doc}113 %postun doc114 if [ "$1" -eq 0 ] ; then115 %ghc_reindex_haddock116 fi117 %endif118 119 120 %files devel -f %{name}-devel.files121 %defattr(-,root,root,-)122 %{_docdir}/%{name}-%{version}123 124 125 %if %{with doc}126 %files doc -f %{name}-doc.files127 %defattr(-,root,root,-)128 %endif129 130 131 %if %{with prof}132 %files prof -f %{name}-prof.files133 %defattr(-,root,root,-)134 %endif135 136 137 62 %changelog 138 * Mon Mar 152010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0139 - initial packaging for Fedora automatically generated by cabal2spec 63 * Thu Sep 9 2010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0 64 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 -
trunk/server/fedora/specs/ghc-unix-handle.spec
r1590 r1693 1 1 %global pkg_name unix-handle 2 2 3 %bcond_without doc 4 %bcond_without prof 3 %global common_summary Haskell %{pkg_name} library 5 4 6 # ghc does not emit debug information 5 %global common_description A %{pkg_name} library for Haskell. 6 7 # add any Haskell library dependencies here: 8 #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel 9 10 # add any foreign library dependencies here: 11 #%%global ghc_pkg_c_deps @CDEP1@-devel 12 13 %bcond_without shared 14 15 # debuginfo is not useful for ghc 7 16 %global debug_package %{nil} 8 17 … … 10 19 Version: 0.0.0 11 20 Release: 0.%{scriptsversion}%{?dist} 12 Summary: Haskell %{pkg_name} library21 Summary: %{common_summary} 13 22 14 Group: Development/Libraries23 Group: System Environment/Libraries 15 24 License: BSD 16 25 URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} … … 19 28 # fedora ghc archs: 20 29 ExclusiveArch: %{ix86} x86_64 ppc alpha 21 BuildRequires: ghc, ghc-rpm-macros 22 %if %{with doc} 23 BuildRequires: ghc-doc 24 %endif 25 %if %{with prof} 26 BuildRequires: ghc-prof 27 %endif 30 BuildRequires: ghc, ghc-doc, ghc-prof 31 BuildRequires: ghc-rpm-macros >= 0.7.0 32 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} 33 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} 28 34 29 35 %description 30 This package provides the Haskell %{pkg_name} library for ghc. 31 32 33 %package devel 34 Summary: Haskell %{pkg_name} library 35 Group: Development/Libraries 36 Requires: ghc = %{ghc_version} 37 Requires(post): ghc = %{ghc_version} 38 Requires(preun): ghc = %{ghc_version} 39 40 %description devel 41 This package contains the development files for %{name} 42 built for ghc-%{ghc_version}. 43 44 45 %if %{with doc} 46 %package doc 47 Summary: Documentation for %{name} 48 Group: Development/Libraries 49 Requires: ghc-doc = %{ghc_version} 50 Requires(post): ghc-doc = %{ghc_version} 51 Requires(postun): ghc-doc = %{ghc_version} 52 53 %description doc 54 This package contains development documentation files for 55 the %{name} library. 36 %{common_description} 37 %if %{with shared} 38 This package provides the shared library. 56 39 %endif 57 40 58 41 59 %if %{with prof} 60 %package prof 61 Summary: Profiling libraries for %{name} 62 Group: Development/Libraries 63 Requires: %{name}-devel = %{version}-%{release} 64 Requires: ghc-prof = %{ghc_version} 65 66 %description prof 67 This package contains profiling libraries for %{name} 68 built for ghc-%{ghc_version}. 69 %endif 42 %{?ghc_lib_package} 70 43 71 44 … … 75 48 76 49 %build 77 %cabal_configure --ghc %{?with_prof:-p} 78 %cabal build 79 %if %{with doc} 80 %cabal haddock 81 %endif 82 %ghc_gen_scripts 50 %ghc_lib_build 83 51 84 52 85 53 %install 86 54 rm -rf $RPM_BUILD_ROOT 87 %cabal_install 88 %ghc_install_scripts 89 %ghc_gen_filelists %{name} 55 %ghc_lib_install 90 56 91 57 … … 94 60 95 61 96 %post devel97 %ghc_register_pkg98 99 100 %if %{with doc}101 %post doc102 %ghc_reindex_haddock103 %endif104 105 106 %preun devel107 if [ "$1" -eq 0 ] ; then108 %ghc_unregister_pkg109 fi110 111 112 %if %{with doc}113 %postun doc114 if [ "$1" -eq 0 ] ; then115 %ghc_reindex_haddock116 fi117 %endif118 119 120 %files devel -f %{name}-devel.files121 %defattr(-,root,root,-)122 %{_docdir}/%{name}-%{version}123 124 125 %if %{with doc}126 %files doc -f %{name}-doc.files127 %defattr(-,root,root,-)128 %endif129 130 131 %if %{with prof}132 %files prof -f %{name}-prof.files133 %defattr(-,root,root,-)134 %endif135 136 137 62 %changelog 138 * Mon Mar 152010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0139 - initial packaging for Fedora automatically generated by cabal2spec 63 * Thu Sep 9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0 64 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 -
trunk/server/fedora/specs/httpd.spec.patch
r1607 r1693 1 --- httpd.spec.orig 2010-0 8-26 21:00:40.771666965-04002 +++ httpd.spec 2010-0 8-26 21:01:56.601668199-04001 --- httpd.spec.orig 2010-07-27 11:55:33.000000000 -0400 2 +++ httpd.spec 2010-09-06 20:45:28.000000000 -0400 3 3 @@ -7,7 +7,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 Version: 2.2.1 57 -Release: 1%{?dist} .18 +Release: 1%{?dist}. 1.scripts.%{scriptsversion}6 Version: 2.2.16 7 -Release: 1%{?dist} 8 +Release: 1%{?dist}.scripts.%{scriptsversion} 9 9 URL: http://httpd.apache.org/ 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz … … 33 33 %description devel 34 34 The httpd-devel package contains the APXS binary and other files 35 @@ -10 2,6 +111,7 @@35 @@ -103,6 +112,7 @@ 36 36 Requires(post): openssl >= 0.9.7f-4, /bin/cat 37 37 Requires(pre): httpd … … 41 41 42 42 %description -n mod_ssl 43 @@ -1 29,6 +139,13 @@43 @@ -130,6 +140,13 @@ 44 44 # Patch in vendor/release string 45 45 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 55 55 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 56 56 if test "x${vmmn}" != "x%{mmn}"; then 57 @@ -17 7,10 +194,12 @@57 @@ -178,10 +195,12 @@ 58 58 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 59 59 --enable-suexec --with-suexec \ -
trunk/server/fedora/specs/krb5.spec.patch
r1562 r1693 1 --- krb5.spec.orig 2010-05-18 14:16:44.000000000 -04002 +++ krb5.spec 2010-05-20 10:20:32.000000000 -04003 @@ -1 6,7 +16,7 @@4 Summary: The Kerberos network authentication system .1 --- rpmbuild/SPECS/krb5.spec.orig 2010-08-25 11:36:57.000000000 -0400 2 +++ rpmbuild/SPECS/krb5.spec 2010-09-12 20:47:47.000000000 -0400 3 @@ -10,7 +10,7 @@ 4 Summary: The Kerberos network authentication system 5 5 Name: krb5 6 Version: 1. 6.37 -Release: 31%{?dist}8 +Release: 31%{?dist}.scripts.%{scriptsversion}6 Version: 1.7.1 7 -Release: 13%{?dist} 8 +Release: 13%{?dist}.scripts.%{scriptsversion} 9 9 # Maybe we should explode from the now-available-to-everybody tarball instead? 10 # http://web.mit.edu/kerberos/dist/krb5/1. 6/krb5-1.6.2-signed.tar10 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar 11 11 Source0: krb5-%{version}.tar.gz 12 @@ - 114,6 +114,8 @@13 Patch 88: krb5-1.6.1-cs22427.patch14 Patch 89: krb5-CVE-2010-1321-1.6.1.patch12 @@ -92,6 +92,8 @@ 13 Patch103: krb5-1.7.1-24139.patch 14 Patch104: krb5-1.7.1-explife.patch 15 15 16 16 +Patch1000: krb5-kuserok-scripts.patch … … 19 19 URL: http://web.mit.edu/kerberos/www/ 20 20 Group: System Environment/Libraries 21 @@ -155,6 +157,7 @@ 21 @@ -136,6 +138,7 @@ 22 %package libs 23 Summary: The shared libraries used by Kerberos 5 22 24 Group: System Environment/Libraries 23 Prereq: grep, /sbin/ldconfig, sh-utils24 Obsoletes: krb5-configs25 25 +Provides: scripts-krb5-libs 26 26 27 27 %description libs 28 28 Kerberos is a network authentication system. The krb5-libs package 29 @@ -1 478,6 +1481,7 @@30 %patch 87 -p0 -b .kpasswd_ipv631 %patch 88 -p0 -b .cs2242732 %patch 89 -p1 -b .CVE-2010-132129 @@ -1654,6 +1657,7 @@ 30 %patch102 -p1 -b .CVE-2010-1321 31 %patch103 -p1 -b .24139 32 %patch104 -p0 -b .explife 33 33 +%patch1000 -p1 -b .kuserok 34 cp src/krb524/README README.krb52435 34 gzip doc/*.ps 36 35 36 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex -
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} -
trunk/server/fedora/specs/openssh.spec.patch
r1531 r1693 1 --- openssh.spec.orig 2010-0 3-30 02:27:53.000000000 -04002 +++ openssh.spec 2010-0 3-30 02:30:09.000000000 -04003 @@ - 63,7 +63,7 @@1 --- openssh.spec.orig 2010-05-31 06:20:02.000000000 -0400 2 +++ openssh.spec 2010-09-06 21:53:21.000000000 -0400 3 @@ -74,7 +74,7 @@ 4 4 Summary: An open source implementation of SSH protocol versions 1 and 2 5 5 Name: openssh 6 Version: 5. 2p17 -Release: 6%{?dist}%{?rescue_rel}8 +Release: 6%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}6 Version: 5.4p1 7 -Release: %{openssh_rel}%{?dist}%{?rescue_rel} 8 +Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion} 9 9 URL: http://www.openssh.com/portable.html 10 #URL1: http://pamsshagentauth.sourceforge.net 10 11 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz 11 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc 12 @@ -74,6 +74,8 @@ 13 Source1: openssh-nukeacss.sh 14 Source2: sshd.pam 12 @@ -88,6 +88,7 @@ 15 13 Source3: sshd.init 16 +Patch1000: openssh-5.0p1-multihomed.patch 14 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2 15 Source5: pam_ssh_agent-rmheaders 17 16 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch 18 Patch0: openssh-5. 2p1-redhat.patch19 Patch2: openssh-5. 1p1-skip-initial.patch20 Patch 3: openssh-3.8.1p1-krb5-config.patch21 @@ -1 61,6 +163,7 @@17 Patch0: openssh-5.4p1-redhat.patch 18 Patch2: openssh-5.3p1-skip-initial.patch 19 Patch4: openssh-5.2p1-vendor.patch 20 @@ -175,6 +177,7 @@ 22 21 Requires(post): chkconfig >= 0.9, /sbin/service 23 22 Requires(pre): /usr/sbin/useradd … … 27 26 %package askpass 28 27 Summary: A passphrase dialog for OpenSSH and X 29 @@ -2 31,6 +234,9@@30 %patch 65 -p1 -b .fips31 %patch 67 -p1 -b .selabel28 @@ -267,6 +270,8 @@ 29 %patch75 -p1 -b .dso 30 %patch76 -p1 -b .bz595935 32 31 33 +%patch1000 -p1 -b .multihomed34 32 +%patch1001 -p1 -b .gssapi-env 35 33 + -
trunk/server/fedora/specs/scripts-base.spec
r1507 r1693 9 9 Source: %{name}.tar.gz 10 10 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root 11 Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, php_scripts, scripts-shadow-utils11 Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, php_scripts, zephyr, httpdmods, nss_nonlocal, nss_nonlocal.i686 12 12 %define debug_package %{nil} 13 13 -
trunk/server/fedora/specs/scripts-static-cat.spec
r1590 r1693 1 # link with shared libs 2 # andersk: Disabled for 3x faster startup speed. 3 #%%bcond_without dynamic 4 1 5 # ghc does not emit debug information 2 6 %global debug_package %{nil} … … 14 18 # fedora ghc archs: 15 19 ExclusiveArch: %{ix86} x86_64 ppc alpha 16 BuildRequires: ghc, ghc-rpm-macros, ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel 20 BuildRequires: ghc 21 BuildRequires: ghc-rpm-macros >= 0.7.0 22 BuildRequires: ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel 17 23 18 24 %description … … 25 31 26 32 %build 27 %cabal_configure --ghc 28 %cabal build 33 %ghc_bin_build 29 34 30 35 31 36 %install 32 37 rm -rf $RPM_BUILD_ROOT 33 % cabal_install38 %ghc_bin_install 34 39 35 40 … … 44 49 45 50 %changelog 46 * Sun Mar 142010 Anders Kaseorg <andersk@mit.edu> - 0.0-047 - initial packaging for Fedora automatically generated by cabal2spec 51 * Thu Sep 9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0-0 52 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1
Note: See TracChangeset
for help on using the changeset viewer.