Changeset 1808 for branches/fc15-dev/server/fedora

Timestamp:

Apr 18, 2011, 12:17:13 PM (14 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:

• config/etc/mock/scripts-fc15-i386.cfg (modified) (1 diff)
• config/etc/mock/scripts-fc15-x86_64.cfg (modified) (1 diff)
• specs/ghc-MonadCatchIO-mtl.spec (modified) (4 diffs)
• specs/openssh.spec.patch (modified) (2 diffs)

branches/fc15-dev/server/fedora/config/etc/mock/scripts-fc15-i386.cfg

@@ -27 +27 @@
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
+baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/i386/
 failovermethod=priority
 

branches/fc15-dev/server/fedora/config/etc/mock/scripts-fc15-x86_64.cfg

@@ -31 +31 @@
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
+baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/x86_64/
 failovermethod=priority
 

branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec

@@ +1 @@
+# For Haskell Packaging Guidelines see:
+# - https://fedoraproject.org/wiki/Packaging:Haskell
+# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name MonadCatchIO-mtl
 
+# common part of summary for all the subpackages
 %global common_summary Haskell %{pkg_name} library
 
+# main description used for all the subpackages
 %global common_description A %{pkg_name} library for Haskell.
 
-# add any Haskell library dependencies here:
+# add any Haskell library dependencies here: 
 %global ghc_pkg_deps ghc-mtl-devel
 
-# add any foreign library dependencies here:
+# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
+#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
+
+# foreign library dependencies (used for buildrequires and devel subpkg requires)
 #%%global ghc_pkg_c_deps @CDEP1@-devel
 
@@ -18 +27 @@
 Name:           ghc-%{pkg_name}
 Version:        0.3.0.1
-Release:        0.%{scriptsversion}%{?dist}
+Release:        1.%{scriptsversion}%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
-License:        BSD
-URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
+License:        @LICENSE@
+URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha
+ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
 BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.0
+# macros for building haskell packages
+BuildRequires:  ghc-rpm-macros >= 0.7.3
+BuildRequires:  hscolour
 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
@@ -35 +45 @@
 %description
 %{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
-
-
-%{?ghc_lib_package}
 
 
@@ -52 +56 @@
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
+# ghc-%pkg_name{,devel,prof}.files
+%ghc_lib_package
 
 
 %changelog
+* Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.0.1-1
+- regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5
+
 * Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1

branches/fc15-dev/server/fedora/specs/openssh.spec.patch

@@ -1 +1 @@
 --- openssh.spec.orig   2010-05-31 06:20:02.000000000 -0400
 +++ openssh.spec        2010-09-06 21:53:21.000000000 -0400
-@@ -74,7 +74,7 @@
+@@ -78,7 +78,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
- Version: 5.4p1
+ Version: %{openssh_ver}
 -Release: %{openssh_rel}%{?dist}%{?rescue_rel}
 +Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
@@ -10 +10 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -88,6 +88,8 @@
+@@ -92,6 +92,7 @@
  Source3: sshd.init
  Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
  Source5: pam_ssh_agent-rmheaders
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
-+Patch1002: openssh-no-spurious-correct-key-incorrect-host-messages.patch
- Patch0: openssh-5.4p1-redhat.patch
- Patch2: openssh-5.3p1-skip-initial.patch
- Patch4: openssh-5.2p1-vendor.patch
-@@ -175,6 +178,7 @@
- Requires(post): chkconfig >= 0.9, /sbin/service
+
+ Patch100: openssh-5.6p1-wIm.patch
+ Patch0: openssh-5.6p1-redhat.patch
+@@ -207,6 +209,7 @@
  Requires(pre): /usr/sbin/useradd
  Requires: pam >= 1.0.1-3
+ Requires: fipscheck-lib%{_isa} >= 1.3.0
 +Provides: scripts-openssh-server
  
- %package askpass
- Summary: A passphrase dialog for OpenSSH and X
-@@ -267,6 +271,9 @@
- %patch75 -p1 -b .dso
- %patch76 -p1 -b .bz595935
+ %if %{ldap}
+ %package ldap
+@@ -323,6 +326,8 @@
+ %patch80 -p1 -b .biguid
+ %patch81 -p1 -b .clientloop
  
 +%patch1001 -p1 -b .gssapi-env
-+%patch1002 -p1 -b .no-spurious-correct-key-incorrect-host-messages
 +
  autoreconf
- 
- %build
+ pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
+ autoreconf
+