Ignore:
Timestamp:
Apr 18, 2011, 12:17:13 PM (11 years ago)
Author:
achernya
Message:
Additional necessary changes to build the Scripts RPMs on Fedora 15:

 * Update the updates-released URL to download3.fedora.redhat.com in
   the mock configuration
 * Update openssh.spec.patch to apply to openssh5.6p1
 * Regenerate and fix ghc-MonadCatchIO-mtl.spec

Location:
branches/fc15-dev/server/fedora
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/fedora/config/etc/mock/scripts-fc15-i386.cfg

    r1804 r1808  
    2727[updates-released]
    2828name=updates
    29 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
     29#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
     30baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/i386/
    3031failovermethod=priority
    3132
  • branches/fc15-dev/server/fedora/config/etc/mock/scripts-fc15-x86_64.cfg

    r1804 r1808  
    3131[updates-released]
    3232name=updates
    33 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
     33#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
     34baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/x86_64/
    3435failovermethod=priority
    3536
  • branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec

    r1693 r1808  
     1# For Haskell Packaging Guidelines see:
     2# - https://fedoraproject.org/wiki/Packaging:Haskell
     3# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     4
    15%global pkg_name MonadCatchIO-mtl
    26
     7# common part of summary for all the subpackages
    38%global common_summary Haskell %{pkg_name} library
    49
     10# main description used for all the subpackages
    511%global common_description A %{pkg_name} library for Haskell.
    612
    7 # add any Haskell library dependencies here:
     13# add any Haskell library dependencies here: 
    814%global ghc_pkg_deps ghc-mtl-devel
    915
    10 # add any foreign library dependencies here:
     16# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
     17#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
     18
     19# foreign library dependencies (used for buildrequires and devel subpkg requires)
    1120#%%global ghc_pkg_c_deps @CDEP1@-devel
    1221
     
    1827Name:           ghc-%{pkg_name}
    1928Version:        0.3.0.1
    20 Release:        0.%{scriptsversion}%{?dist}
     29Release:        1.%{scriptsversion}%{?dist}
    2130Summary:        %{common_summary}
    2231
    2332Group:          System Environment/Libraries
    24 License:        BSD
    25 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
     33License:        @LICENSE@
     34URL:            http://hackage.haskell.org/package/%{pkg_name}
    2635Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    27 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2836# fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha
     37ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    3038BuildRequires:  ghc, ghc-doc, ghc-prof
    31 BuildRequires:  ghc-rpm-macros >= 0.7.0
     39# macros for building haskell packages
     40BuildRequires:  ghc-rpm-macros >= 0.7.3
     41BuildRequires:  hscolour
    3242%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    3343%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
     
    3545%description
    3646%{common_description}
    37 %if %{with shared}
    38 This package provides the shared library.
    39 %endif
    40 
    41 
    42 %{?ghc_lib_package}
    4347
    4448
     
    5256
    5357%install
    54 rm -rf $RPM_BUILD_ROOT
    5558%ghc_lib_install
    5659
    5760
    58 %clean
    59 rm -rf $RPM_BUILD_ROOT
     61# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
     62# ghc-%pkg_name{,devel,prof}.files
     63%ghc_lib_package
    6064
    6165
    6266%changelog
     67* Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.0.1-1
     68- regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5
     69
    6370* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
    6471- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
  • branches/fc15-dev/server/fedora/specs/openssh.spec.patch

    r1739 r1808  
    11--- openssh.spec.orig   2010-05-31 06:20:02.000000000 -0400
    22+++ openssh.spec        2010-09-06 21:53:21.000000000 -0400
    3 @@ -74,7 +74,7 @@
     3@@ -78,7 +78,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.4p1
     6 Version: %{openssh_ver}
    77-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
    88+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
     
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    1111 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    12 @@ -88,6 +88,8 @@
     12@@ -92,6 +92,7 @@
    1313 Source3: sshd.init
    1414 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
    1515 Source5: pam_ssh_agent-rmheaders
    1616+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    17 +Patch1002: openssh-no-spurious-correct-key-incorrect-host-messages.patch
    18  Patch0: openssh-5.4p1-redhat.patch
    19  Patch2: openssh-5.3p1-skip-initial.patch
    20  Patch4: openssh-5.2p1-vendor.patch
    21 @@ -175,6 +178,7 @@
    22  Requires(post): chkconfig >= 0.9, /sbin/service
     17
     18 Patch100: openssh-5.6p1-wIm.patch
     19 Patch0: openssh-5.6p1-redhat.patch
     20@@ -207,6 +209,7 @@
    2321 Requires(pre): /usr/sbin/useradd
    2422 Requires: pam >= 1.0.1-3
     23 Requires: fipscheck-lib%{_isa} >= 1.3.0
    2524+Provides: scripts-openssh-server
    2625 
    27  %package askpass
    28  Summary: A passphrase dialog for OpenSSH and X
    29 @@ -267,6 +271,9 @@
    30  %patch75 -p1 -b .dso
    31  %patch76 -p1 -b .bz595935
     26 %if %{ldap}
     27 %package ldap
     28@@ -323,6 +326,8 @@
     29 %patch80 -p1 -b .biguid
     30 %patch81 -p1 -b .clientloop
    3231 
    3332+%patch1001 -p1 -b .gssapi-env
    34 +%patch1002 -p1 -b .no-spurious-correct-key-incorrect-host-messages
    3533+
    3634 autoreconf
    37  
    38  %build
     35 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
     36 autoreconf
     37
Note: See TracChangeset for help on using the changeset viewer.