Ignore:
Timestamp:
Oct 23, 2010, 8:07:08 AM (13 years ago)
Author:
ezyang
Message:
Merge Fedora 13 development back to trunk.
Location:
trunk
Files:
4 deleted
11 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/server/fedora

    • Property svn:ignore set to
      .dload
      download_stamp
      rpmbuild

  • trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec

    r1590 r1693  
    11%global pkg_name MonadCatchIO-mtl
    22
    3 %bcond_without doc
    4 %bcond_without prof
     3%global common_summary Haskell %{pkg_name} library
    54
    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
    716%global debug_package %{nil}
    817
    … …  
    1019Version:        0.3.0.1
    1120Release:        0.%{scriptsversion}%{?dist}
    12 Summary:        Haskell %{pkg_name} library
     21Summary:        %{common_summary}
    1322
    14 Group:          Development/Libraries
     23Group:          System Environment/Libraries
    1524License:        BSD
    1625URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
    … …  
    1928# fedora ghc archs:
    2029ExclusiveArch:  %{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
     30BuildRequires:  ghc, ghc-doc, ghc-prof
     31BuildRequires:  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}}
    2834
    2935%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}
     38This package provides the shared library.
    5639%endif
    5740
    5841
    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}
    7043
    7144
    … …  
    7548
    7649%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
    8351
    8452
    8553%install
    8654rm -rf $RPM_BUILD_ROOT
    87 %cabal_install
    88 %ghc_install_scripts
    89 %ghc_gen_filelists %{name}
     55%ghc_lib_install
    9056
    9157
    … …  
    9460
    9561
    96 %post devel
    97 %ghc_register_pkg
    98 
    99 
    100 %if %{with doc}
    101 %post doc
    102 %ghc_reindex_haddock
    103 %endif
    104 
    105 
    106 %preun devel
    107 if [ "$1" -eq 0 ] ; then
    108   %ghc_unregister_pkg
    109 fi
    110 
    111 
    112 %if %{with doc}
    113 %postun doc
    114 if [ "$1" -eq 0 ] ; then
    115   %ghc_reindex_haddock
    116 fi
    117 %endif
    118 
    119 
    120 %files devel -f %{name}-devel.files
    121 %defattr(-,root,root,-)
    122 #%{_docdir}/%{name}-%{version}
    123 
    124 
    125 %if %{with doc}
    126 %files doc -f %{name}-doc.files
    127 %defattr(-,root,root,-)
    128 %endif
    129 
    130 
    131 %if %{with prof}
    132 %files prof -f %{name}-prof.files
    133 %defattr(-,root,root,-)
    134 %endif
    135 
    136 
    13762%changelog
    138 * Mon Mar 15 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
    139 - 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  
    11%global pkg_name cgi
    22
    3 %bcond_without doc
    4 %bcond_without prof
     3%global common_summary Haskell %{pkg_name} library
    54
    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
    716%global debug_package %{nil}
    817
    … …  
    1019Version:        3001.1.8.1
    1120Release:        0.%{scriptsversion}%{?dist}
    12 Summary:        Haskell %{pkg_name} library
     21Summary:        %{common_summary}
    1322
    14 Group:          Development/Libraries
     23Group:          System Environment/Libraries
    1524License:        BSD
    1625URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
    … …  
    1928# fedora ghc archs:
    2029ExclusiveArch:  %{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
     30BuildRequires:  ghc, ghc-doc, ghc-prof
     31BuildRequires:  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}}
    2834
    2935%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}
     38This package provides the shared library.
    5639%endif
    5740
    5841
    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}
    7043
    7144
    … …  
    7548
    7649%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
    8351
    8452
    8553%install
    8654rm -rf $RPM_BUILD_ROOT
    87 %cabal_install
    88 %ghc_install_scripts
    89 %ghc_gen_filelists %{name}
     55%ghc_lib_install
    9056
    9157
    … …  
    9460
    9561
    96 %post devel
    97 %ghc_register_pkg
    98 
    99 
    100 %if %{with doc}
    101 %post doc
    102 %ghc_reindex_haddock
    103 %endif
    104 
    105 
    106 %preun devel
    107 if [ "$1" -eq 0 ] ; then
    108   %ghc_unregister_pkg
    109 fi
    110 
    111 
    112 %if %{with doc}
    113 %postun doc
    114 if [ "$1" -eq 0 ] ; then
    115   %ghc_reindex_haddock
    116 fi
    117 %endif
    118 
    119 
    120 %files devel -f %{name}-devel.files
    121 %defattr(-,root,root,-)
    122 %{_docdir}/%{name}-%{version}
    123 
    124 
    125 %if %{with doc}
    126 %files doc -f %{name}-doc.files
    127 %defattr(-,root,root,-)
    128 %endif
    129 
    130 
    131 %if %{with prof}
    132 %files prof -f %{name}-prof.files
    133 %defattr(-,root,root,-)
    134 %endif
    135 
    136 
    13762%changelog
    138 * Mon Mar 15 2010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0
    139 - 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  
    11%global pkg_name unix-handle
    22
    3 %bcond_without doc
    4 %bcond_without prof
     3%global common_summary Haskell %{pkg_name} library
    54
    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
    716%global debug_package %{nil}
    817
    … …  
    1019Version:        0.0.0
    1120Release:        0.%{scriptsversion}%{?dist}
    12 Summary:        Haskell %{pkg_name} library
     21Summary:        %{common_summary}
    1322
    14 Group:          Development/Libraries
     23Group:          System Environment/Libraries
    1524License:        BSD
    1625URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
    … …  
    1928# fedora ghc archs:
    2029ExclusiveArch:  %{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
     30BuildRequires:  ghc, ghc-doc, ghc-prof
     31BuildRequires:  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}}
    2834
    2935%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}
     38This package provides the shared library.
    5639%endif
    5740
    5841
    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}
    7043
    7144
    … …  
    7548
    7649%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
    8351
    8452
    8553%install
    8654rm -rf $RPM_BUILD_ROOT
    87 %cabal_install
    88 %ghc_install_scripts
    89 %ghc_gen_filelists %{name}
     55%ghc_lib_install
    9056
    9157
    … …  
    9460
    9561
    96 %post devel
    97 %ghc_register_pkg
    98 
    99 
    100 %if %{with doc}
    101 %post doc
    102 %ghc_reindex_haddock
    103 %endif
    104 
    105 
    106 %preun devel
    107 if [ "$1" -eq 0 ] ; then
    108   %ghc_unregister_pkg
    109 fi
    110 
    111 
    112 %if %{with doc}
    113 %postun doc
    114 if [ "$1" -eq 0 ] ; then
    115   %ghc_reindex_haddock
    116 fi
    117 %endif
    118 
    119 
    120 %files devel -f %{name}-devel.files
    121 %defattr(-,root,root,-)
    122 %{_docdir}/%{name}-%{version}
    123 
    124 
    125 %if %{with doc}
    126 %files doc -f %{name}-doc.files
    127 %defattr(-,root,root,-)
    128 %endif
    129 
    130 
    131 %if %{with prof}
    132 %files prof -f %{name}-prof.files
    133 %defattr(-,root,root,-)
    134 %endif
    135 
    136 
    13762%changelog
    138 * Mon Mar 15 2010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
    139 - 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-08-26 21:00:40.771666965 -0400
    2 +++ httpd.spec  2010-08-26 21:01:56.601668199 -0400
     1--- httpd.spec.orig     2010-07-27 11:55:33.000000000 -0400
     2+++ httpd.spec  2010-09-06 20:45:28.000000000 -0400
    33@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.15
    7 -Release: 1%{?dist}.1
    8 +Release: 1%{?dist}.1.scripts.%{scriptsversion}
     6 Version: 2.2.16
     7-Release: 1%{?dist}
     8+Release: 1%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    … …  
    3333 %description devel
    3434 The httpd-devel package contains the APXS binary and other files
    35 @@ -102,6 +111,7 @@
     35@@ -103,6 +112,7 @@
    3636 Requires(post): openssl >= 0.9.7f-4, /bin/cat
    3737 Requires(pre): httpd
    … …  
    4141 
    4242 %description -n mod_ssl
    43 @@ -129,6 +139,13 @@
     43@@ -130,6 +140,13 @@
    4444 # Patch in vendor/release string
    4545 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    … …  
    5555 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5656 if test "x${vmmn}" != "x%{mmn}"; then
    57 @@ -177,10 +194,12 @@
     57@@ -178,10 +195,12 @@
    5858         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5959        --enable-suexec --with-suexec \

  • trunk/server/fedora/specs/krb5.spec.patch

    r1562 r1693  
    1 --- krb5.spec.orig      2010-05-18 14:16:44.000000000 -0400
    2 +++ krb5.spec   2010-05-20 10:20:32.000000000 -0400
    3 @@ -16,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
    55 Name: krb5
    6  Version: 1.6.3
    7 -Release: 31%{?dist}
    8 +Release: 31%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.7.1
     7-Release: 13%{?dist}
     8+Release: 13%{?dist}.scripts.%{scriptsversion}
    99 # 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.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -114,6 +114,8 @@
    13  Patch88: krb5-1.6.1-cs22427.patch
    14  Patch89: krb5-CVE-2010-1321-1.6.1.patch
     12@@ -92,6 +92,8 @@
     13 Patch103: krb5-1.7.1-24139.patch
     14 Patch104: krb5-1.7.1-explife.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
    … …  
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 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
    2224 Group: System Environment/Libraries
    23  Prereq: grep, /sbin/ldconfig, sh-utils
    24  Obsoletes: krb5-configs
    2525+Provides: scripts-krb5-libs
    2626 
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -1478,6 +1481,7 @@
    30  %patch87 -p0 -b .kpasswd_ipv6
    31  %patch88 -p0 -b .cs22427
    32  %patch89 -p1 -b .CVE-2010-1321
     29@@ -1654,6 +1657,7 @@
     30 %patch102 -p1 -b .CVE-2010-1321
     31 %patch103 -p1 -b .24139
     32 %patch104 -p0 -b .explife
    3333+%patch1000 -p1 -b .kuserok
    34  cp src/krb524/README README.krb524
    3534 gzip doc/*.ps
    3635 
     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
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
    55 # for real releases make pkgrel 1 (or more for extra releases)
    66 #%define pkgrel 0.1.rc1
    7 -%define pkgrel 1.1
    8 +%define pkgrel 1.1.99scripts.%{scriptsversion}
     7-%define pkgrel 0.pre3
     8+%define pkgrel 0.pre3.99scripts.%{scriptsversion}
    99 
    1010 %if %{?osvers:0}%{!?osvers:1}
    1111 %define osvers 1
    12 @@ -261,6 +261,11 @@
     12@@ -261,6 +261,10 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    … …  
    1717+Patch1003: openafs-localcsdb.patch
    1818+Patch1005: openafs-numsysnames.patch
    19 +Patch1006: openafs-release-glock.patch
    2019+
    2120 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2221 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2322 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    24 @@ -343,6 +348,7 @@
     23@@ -343,6 +347,7 @@
    2524 %if %{build_userspace}
    2625 
    2726 %package client
    2827+Provides: scripts-openafs-client
    29  Requires: binutils, openafs = %{PACKAGE_VERSION}
     28 Requires: binutils, openafs = %{version}
    3029 
    3130 %if %{fedorakmod}
    32 @@ -403,6 +409,7 @@
     31@@ -403,6 +408,7 @@
    3332 
    3433 %if %{build_authlibs}
    … …  
    3837 Group: Networking/Filesystems
    3938 
    40 @@ -419,6 +426,7 @@
     39@@ -419,6 +425,7 @@
    4140 %endif
    4241 
    … …  
    4443+Provides: scripts-openafs-authlibs-devel
    4544 %if %{build_authlibs}
    46  Requires: openafs-authlibs = %{PACKAGE_VERSION}
     45 Requires: openafs-authlibs = %{version}
    4746 %endif
    48 @@ -437,6 +445,7 @@
     47@@ -437,6 +444,7 @@
    4948 libraries.
    5049 
    … …  
    5453 Group: Development/Filesystems
    5554 
    56 @@ -465,6 +474,7 @@
     55@@ -465,6 +473,7 @@
    5756 administrators.
    5857 
    … …  
    6160 Summary: OpenAFS Kernel Module source tree
    6261 Group: Networking/Filesystems
    63  Provides: openafs-kernel = %{PACKAGE_VERSION}
    64 @@ -514,6 +524,7 @@
     62 Provides: openafs-kernel = %{version}
     63@@ -514,6 +523,7 @@
    6564 
    6665 %if %{krb5support}
    … …  
    6867+Provides: scripts-openafs-krb5
    6968 Summary: OpenAFS programs to use with krb5
    70  Requires: openafs = %{PACKAGE_VERSION}
     69 Requires: openafs = %{version}
    7170 Group: Networking/Filesystems
    72 @@ -540,7 +551,7 @@
     71@@ -540,7 +550,7 @@
    7372 %if %{build_modules}
    7473 
    … …  
    7978 %else
    8079 
    81 @@ -699,6 +710,10 @@
     80@@ -699,6 +709,9 @@
    8281 
    8382 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    … …  
    8685+%patch1003 -p1 -b .localcsdb
    8786+%patch1005 -p1 -b .numsysnames
    88 +%patch1006 -p1 -b .release-glock
    8987 
    9088 ##############################################################################
    9189 #
    92 @@ -1209,7 +1224,7 @@
    93  rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
    94  
    95  # remove man pages from programs deleted above
    96 -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 ; do
    97 +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 ; do
    98    rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
    99  done
    100  
    101 @@ -1569,7 +1584,6 @@
    102  %{_libdir}/librxstat.a
    103  %{_libdir}/libubik.a
    104  %{_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-03-30 02:27:53.000000000 -0400
    2 +++ openssh.spec        2010-03-30 02:30:09.000000000 -0400
    3 @@ -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 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.2p1
    7 -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}
    99 URL: http://www.openssh.com/portable.html
     10 #URL1: http://pamsshagentauth.sourceforge.net
    1011 #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 @@
    1513 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
    1716+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    18  Patch0: openssh-5.2p1-redhat.patch
    19  Patch2: openssh-5.1p1-skip-initial.patch
    20  Patch3: openssh-3.8.1p1-krb5-config.patch
    21 @@ -161,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 @@
    2221 Requires(post): chkconfig >= 0.9, /sbin/service
    2322 Requires(pre): /usr/sbin/useradd
    … …  
    2726 %package askpass
    2827 Summary: A passphrase dialog for OpenSSH and X
    29 @@ -231,6 +234,9 @@
    30  %patch65 -p1 -b .fips
    31  %patch67 -p1 -b .selabel
     28@@ -267,6 +270,8 @@
     29 %patch75 -p1 -b .dso
     30 %patch76 -p1 -b .bz595935
    3231 
    33 +%patch1000 -p1 -b .multihomed
    3432+%patch1001 -p1 -b .gssapi-env
    3533+

  • trunk/server/fedora/specs/scripts-base.spec

    r1507 r1693  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_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-utils
     11Requires: 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
    1212%define debug_package %{nil}
    1313

  • 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
    15# ghc does not emit debug information
    26%global debug_package %{nil}
    … …  
    1418# fedora ghc archs:
    1519ExclusiveArch:  %{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
     20BuildRequires:  ghc
     21BuildRequires:  ghc-rpm-macros >= 0.7.0
     22BuildRequires:  ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
    1723
    1824%description
    … …  
    2531
    2632%build
    27 %cabal_configure --ghc
    28 %cabal build
     33%ghc_bin_build
    2934
    3035
    3136%install
    3237rm -rf $RPM_BUILD_ROOT
    33 %cabal_install
     38%ghc_bin_install
    3439
    3540
    … …  
    4449
    4550%changelog
    46 * Sun Mar 14 2010 Anders Kaseorg <andersk@mit.edu> - 0.0-0
    47 - 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.