Changeset 2246 for trunk/server/fedora
- Timestamp:
- Jun 27, 2012, 10:29:47 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 16 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/fc17-dev (added) merged: 2081,2195-2198,2202,2204-2208,2210-2212,2215-2226,2230-2232,2235-2236,2238-2243,2245
- Property svn:mergeinfo changed
-
trunk/server/fedora/Makefile
r2213 r2246 19 19 # See /COPYRIGHT in this repository for more information. 20 20 21 upstream_yum = krb5 krb5.i686 httpd openssh r edland-bindings rubygems22 hackage = MonadCatchIO-mtl-0.3.0.2cgi-3001.1.8.2 unix-handle-0.0.023 upstream_hackage = ghc- MonadCatchIO-mtl ghc-cgi ghc-unix-handle21 upstream_yum = krb5 krb5.i686 httpd openssh rubygems 22 hackage = cgi-3001.1.8.2 unix-handle-0.0.0 23 upstream_hackage = ghc-cgi ghc-unix-handle 24 24 upstream = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss 25 25 oursrc = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs … … 151 151 PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ 152 152 rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec 153 /usr/bin/mock -r scripts-fc1 5-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`153 /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` 154 154 155 155 $(filter-out %.i686,$(oursrc)): %: setup 156 156 PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ 157 157 rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec 158 /usr/bin/mock -r scripts-fc1 5-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`158 /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` 159 159 160 160 $(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')' … … 162 162 $(filter %.i686,$(upstream)): %.i686: setup patch-specs 163 163 rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec 164 /usr/bin/mock -r scripts-fc1 5-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`164 /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` 165 165 166 166 $(filter-out %.i686,$(upstream)): %: setup patch-specs 167 167 rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec 168 /usr/bin/mock -r scripts-fc1 5-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`168 /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` 169 169 170 170 openafs-kernel: setup 171 171 PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ 172 172 rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec 173 /usr/bin/mock -r scripts-fc1 5-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`173 /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1` 174 174 175 175 #sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong -
trunk/server/fedora/config/etc/hosts
r2066 r2246 20 20 18.181.0.135 shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9 21 21 18.181.0.141 golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10 22 18.181.0.203 miracle-cure.mit.edu miracle-cure scripts11.mit.edu scripts11 23 18.181.0.204 lucky-star.mit.edu lucky-star scripts12.mit.edu scripts12 22 24 23 25 172.21.0.57 better-mousetrap.mit.edu … … 31 33 172.21.0.135 shining-armor.mit.edu 32 34 172.21.0.141 golden-egg.mit.edu 35 172.21.0.203 miracle-cure.mit.edu 36 172.21.0.204 lucky-star.mit.edu -
trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf
r2066 r2246 14 14 shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \ 15 15 golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \ 16 miracle-cure.mit.edu miracle-cure m-c.mit.edu m-c scripts11.mit.edu scripts11 18.181.0.203 \ 17 lucky-star.mit.edu lucky-star l-s.mit.edu l-s scripts12.mit.edu scripts12 18.181.0.204 \ 16 18 localhost 127.0.0.1 ::1 -
trunk/server/fedora/config/etc/scripts/allowed-filecaps.list
r2173 r2246 1 / bin/ping2 / bin/ping61 /usr/bin/ping 2 /usr/bin/ping6 3 3 /usr/sbin/fping 4 4 /usr/sbin/fping6 -
trunk/server/fedora/config/etc/scripts/allowed-setugid.list
r2173 r2246 1 / sbin/pam_timestamp_check2 / sbin/unix_chkpwd1 /usr/sbin/pam_timestamp_check 2 /usr/sbin/unix_chkpwd 3 3 /usr/bin/at 4 4 /usr/bin/crontab -
trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1
r2132 r2246 14 14 18.181.0.141 via 172.21.0.141 15 15 18.181.0.199 via 172.21.0.199 16 18.181.0.203 via 172.21.0.203 17 18.181.0.204 via 172.21.0.204 -
trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl
r2188 r2246 136 136 } elsif ($message =~ m|^Set /proc/self/oom_score_adj to |) { 137 137 } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) { 138 } elsif ($message =~ m|^selinux sandbox not useful \[preauth\]$|) { 138 139 } else { 139 140 sendmsg($message, "scripts-spew"); -
trunk/server/fedora/config/etc/yum.repos.d/scripts.repo
r2066 r2246 1 1 [scripts] 2 2 name=Scripts 3 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc1 5/3 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/ 4 4 enabled=1 5 5 gpgcheck=0 … … 7 7 [scripts-testing] 8 8 name=Scripts Testing 9 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc1 5-testing/9 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17-testing/ 10 10 enabled=0 11 11 gpgcheck=0 -
trunk/server/fedora/specs/ghc-cgi.spec
r2066 r2246 1 # For Haskell Packaging Guidelines see:2 # -https://fedoraproject.org/wiki/Packaging:Haskell3 # -https://fedoraproject.org/wiki/PackagingDrafts/Haskell1 # cabal2spec-0.25 2 # https://fedoraproject.org/wiki/Packaging:Haskell 3 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell 4 4 5 5 %global pkg_name cgi 6 6 7 # common part of summary for all the subpackages8 7 %global common_summary Haskell %{pkg_name} library 9 8 10 # main description used for all the subpackages11 9 %global common_description A %{pkg_name} library for Haskell. 12 13 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)14 %global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel15 16 # foreign library dependencies (used for buildrequires and devel subpkg requires)17 #%%global ghc_pkg_c_deps @CDEP1@-devel18 10 19 11 Name: ghc-%{pkg_name} … … 24 16 Group: System Environment/Libraries 25 17 License: BSD 18 # BEGIN cabal2spec 26 19 URL: http://hackage.haskell.org/package/%{pkg_name} 27 20 Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz 28 # fedora ghc archs: 29 ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 30 BuildRequires: ghc, ghc-doc, ghc-prof 31 # macros for building haskell packages 32 BuildRequires: ghc-rpm-macros >= 0.7.3 33 BuildRequires: hscolour 34 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} 35 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} 21 ExclusiveArch: %{ghc_arches} 22 BuildRequires: ghc-Cabal-devel 23 BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} 24 # END cabal2spec 25 BuildRequires: ghc-network-prof 26 BuildRequires: ghc-parsec-prof 27 BuildRequires: ghc-mtl-prof 28 BuildRequires: ghc-MonadCatchIO-mtl-prof 29 BuildRequires: ghc-xhtml-prof 36 30 37 31 %description … … 51 45 52 46 53 # define the devel and prof subpkgs, devel post[un] scripts, and filelists: 54 # ghc-%pkg_name{,devel,prof}.files 55 %ghc_lib_package 47 # devel subpackage 48 %ghc_devel_package 49 50 %ghc_devel_description 51 52 53 %ghc_devel_post_postun 54 55 56 %ghc_files LICENSE 56 57 57 58 58 59 %changelog 60 * Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.2-0 61 - regenerated packaging with cabal2spec-0.25.5 62 59 63 * Mon May 2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.2-0 60 64 - regenerated packaging with cabal2spec-0.22.5 -
trunk/server/fedora/specs/ghc-unix-handle.spec
r2066 r2246 1 # For Haskell Packaging Guidelines see:2 # -https://fedoraproject.org/wiki/Packaging:Haskell3 # -https://fedoraproject.org/wiki/PackagingDrafts/Haskell1 # cabal2spec-0.25 2 # https://fedoraproject.org/wiki/Packaging:Haskell 3 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell 4 4 5 5 %global pkg_name unix-handle 6 6 7 # common part of summary for all the subpackages8 7 %global common_summary Haskell %{pkg_name} library 9 8 10 # main description used for all the subpackages11 9 %global common_description A %{pkg_name} library for Haskell. 12 13 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)14 #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel15 16 # foreign library dependencies (used for buildrequires and devel subpkg requires)17 #%%global ghc_pkg_c_deps @CDEP1@-devel18 10 19 11 Name: ghc-%{pkg_name} … … 24 16 Group: System Environment/Libraries 25 17 License: BSD 18 # BEGIN cabal2spec 26 19 URL: http://hackage.haskell.org/package/%{pkg_name} 27 20 Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz 28 # fedora ghc archs: 29 ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 30 BuildRequires: ghc, ghc-doc, ghc-prof 31 # macros for building haskell packages 32 BuildRequires: ghc-rpm-macros >= 0.7.3 33 BuildRequires: hscolour 34 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} 35 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} 21 ExclusiveArch: %{ghc_arches} 22 BuildRequires: ghc-Cabal-devel 23 BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} 24 # END cabal2spec 36 25 37 26 %description … … 51 40 52 41 53 # define the devel and prof subpkgs, devel post[un] scripts, and filelists: 54 # ghc-%pkg_name{,devel,prof}.files 55 %ghc_lib_package 42 # devel subpackage 43 %ghc_devel_package 44 45 %ghc_devel_description 46 47 48 %ghc_devel_post_postun 49 50 51 %ghc_files LICENSE 56 52 57 53 58 54 %changelog 55 * Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0 56 - regenerated packaging with cabal2spec-0.25.5 57 59 58 * Mon May 2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0.0-0 60 59 - regenerated packaging with cabal2spec-0.22.5 -
trunk/server/fedora/specs/httpd.spec.patch
r2157 r2246 1 --- httpd.spec.~1~ 2012-0 2-13 09:46:36.000000000 -05002 +++ httpd.spec 2012-0 3-26 01:33:53.247271289-04003 @@ - 8,7 +8,7 @@1 --- httpd.spec.~1~ 2012-04-30 05:52:31.000000000 -0400 2 +++ httpd.spec 2012-05-22 23:31:12.397142763 -0400 3 @@ -9,7 +9,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 6 Version: 2.2.22 7 -Release: 1%{?dist}8 +Release: 1%{?dist}.scripts.%{scriptsversion}7 -Release: 4%{?dist} 8 +Release: 4%{?dist}.scripts.%{scriptsversion} 9 9 URL: http://httpd.apache.org/ 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 11 11 Source1: index.html 12 @@ -5 4,6 +54,15@@13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}14 Requires : httpd-tools = %{version}-%{release}, apr-util-ldap,systemd-units12 @@ -58,6 +58,14 @@ 13 Requires(postun): systemd-units 14 Requires(post): systemd-units 15 15 16 16 +Provides: scripts-httpd = %{version}-%{release} … … 21 21 +Patch1006: httpd-suexec-cloexec.patch 22 22 +Patch1007: httpd-fixup-vhost.patch 23 +Patch1008: httpd-sysv-deps.patch24 23 + 25 24 %description 26 25 The Apache HTTP Server is a powerful, efficient, and extensible 27 26 web server. 28 @@ -6 4,6 +76,7 @@27 @@ -68,6 +77,7 @@ 29 28 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 30 29 Requires: apr-devel, apr-util-devel, pkgconfig … … 34 33 %description devel 35 34 The httpd-devel package contains the APXS binary and other files 36 @@ -10 2,6 +115,7 @@35 @@ -106,6 +116,7 @@ 37 36 Requires(post): openssl, /bin/cat 38 37 Requires(pre): httpd … … 42 41 43 42 %description -n mod_ssl 44 @@ -110,6 +124,11 @@ 45 Security (TLS) protocols. 46 47 %prep 48 + 49 +# Horrible hack to patch the httpd.init file 50 +cd $RPM_SOURCE_DIR 51 +%patch1008 -p1 -b .sysv-deps 52 + 53 %setup -q 54 %patch1 -p1 -b .apctl 55 %patch2 -p1 -b .apxs 56 @@ -128,6 +147,14 @@ 43 @@ -133,6 +149,13 @@ 57 44 # Patch in vendor/release string 58 45 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 64 51 +%patch1006 -p1 -b .cloexec 65 52 +%patch1007 -p1 -b .fixup-vhost 66 +# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec67 53 + 68 54 # Safety check: prevent build if defined MMN does not equal upstream MMN. 69 55 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 70 56 if test "x${vmmn}" != "x%{mmn}"; then 71 @@ -1 75,10 +205,12 @@57 @@ -193,10 +217,12 @@ 72 58 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 73 59 --enable-suexec --with-suexec \ -
trunk/server/fedora/specs/krb5.spec.patch
r2187 r2246 1 --- krb5.spec. ~1~ 2012-03-08 16:20:41.000000000 -05002 +++ krb5.spec 2012-0 4-01 22:07:14.834013302-04003 @@ - 6,7 +6,7 @@1 --- krb5.spec.orig 2012-06-17 19:29:24.140005717 -0400 2 +++ krb5.spec 2012-06-17 19:30:47.834405053 -0400 3 @@ -20,7 +20,7 @@ 4 4 Summary: The Kerberos network authentication system 5 5 Name: krb5 6 Version: 1. 9.37 -Release: 1%{?dist}8 +Release: 1%{?dist}.scripts.%{scriptsversion}6 Version: 1.10.2 7 -Release: 2%{?dist} 8 +Release: 2%{?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. 9/krb5-1.9.3-signed.tar10 # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar 11 11 Source0: krb5-%{version}.tar.gz 12 @@ -6 4,6 +64,8 @@13 Patch10 2: krb5-1.9-7048.patch14 Patch10 3: krb5-kvno-230379.patch12 @@ -69,6 +69,8 @@ 13 Patch105: krb5-kvno-230379.patch 14 Patch106: krb5-1.10.2-keytab-etype.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 @@ -1 13,6 +115,7 @@21 @@ -126,6 +128,7 @@ 22 22 %package libs 23 23 Summary: The shared libraries used by Kerberos 5 … … 27 27 %description libs 28 28 Kerberos is a network authentication system. The krb5-libs package 29 @@ -2 19,6 +222,7 @@30 %patch10 1 -p1 -b .704731 %patch10 2 -p1 -b .704832 %patch10 3 -p1 -b .kvno29 @@ -245,6 +248,7 @@ 30 %patch103 -p0 -b .gcc47 31 %patch105 -p1 -b .kvno 32 %patch106 -p1 -b .keytab-etype 33 33 +%patch1000 -p1 -b .kuserok 34 rm src/lib/krb5/krb/deltat.c 35 34 36 gzip doc/*.ps 35 36 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex -
trunk/server/fedora/specs/openssh.spec.patch
r2185 r2246 1 --- openssh.spec. ~1~ 2012-02-14 11:06:13.000000000 -05002 +++ openssh.spec 2012-0 2-25 13:02:28.660616538 -05003 @@ - 78,7 +78,7 @@1 --- openssh.spec.orig 2012-06-18 18:16:43.764813595 -0400 2 +++ openssh.spec 2012-06-18 18:24:40.478720527 -0400 3 @@ -82,7 +82,7 @@ 4 4 Summary: An open source implementation of SSH protocol versions 1 and 2 5 5 Name: openssh … … 10 10 #URL1: http://pamsshagentauth.sourceforge.net 11 11 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz 12 @@ - 92,6 +92,7 @@13 Source3: sshd.init14 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz215 Source5: pam_ssh_agent-rmheaders12 @@ -218,6 +218,7 @@ 13 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604 14 # sctp 15 #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993 16 16 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch 17 17 18 Patch100: openssh-5.6p1-wIm.patch19 Patch0: openssh-5.6p1-redhat.patch20 @@ -2 14,6 +215,7 @@21 Requires(pre): /usr/sbin/useradd22 Requires: pam >= 1.0.1-318 License: BSD 19 Group: Applications/Internet 20 @@ -271,6 +272,7 @@ 21 Group: Applications/Internet 22 Requires: openssh = %{version}-%{release} 23 23 Requires: fipscheck-lib%{_isa} >= 1.3.0 24 24 +Provides: scripts-openssh-server 25 25 26 %if %{ldap} 27 %package ldap 28 @@ -333,6 +335,8 @@ 29 %patch83 -p0 -b .oomkiller 30 %patch84 -p1 -b .legacy 26 %package server 27 Summary: An open source SSH server daemon 28 @@ -456,15 +458,19 @@ 29 %patch713 -p1 -b .ctr-cavs 30 31 %patch800 -p1 -b .gsskex 32 -%patch801 -p1 -b .force_krb 33 +# Remove force_krb as it conflicts with admof 34 +# %patch801 -p1 -b .force_krb 35 36 %patch900 -p1 -b .canohost 37 -%patch901 -p1 -b .kuserok 38 +# Remove the kuserok patch as it won't apply without patch800 39 +# %patch901 -p1 -b .kuserok 40 41 %if 0 42 # Nothing here yet 43 %endif 31 44 32 45 +%patch1001 -p1 -b .gssapi-env -
trunk/server/fedora/specs/rubygems.spec.patch
r2189 r2246 1 --- rubygems.spec.~1~ 2012-04-2 0 14:46:27.000000000 -04002 +++ rubygems.spec 2012-05- 03 14:12:52.421863447-04003 @@ -1 5,7 +15,7 @@1 --- rubygems.spec.~1~ 2012-04-28 04:01:50.000000000 -0400 2 +++ rubygems.spec 2012-05-22 23:47:16.001145101 -0400 3 @@ -18,7 +18,7 @@ 4 4 Summary: The Ruby standard for packaging ruby libraries 5 5 Name: rubygems 6 Version: 1. 7.27 -Release: 5%{?dist}8 +Release: 5%{?dist}.scripts.%{scriptsversion}6 Version: 1.8.24 7 -Release: 1%{?dist} 8 +Release: 1%{?dist}.scripts.%{scriptsversion} 9 9 Group: Development/Libraries 10 # No GPL version is specified.11 License: Ruby or GPL+12 @@ - 42,6 +42,9@@13 # Insecure connection to SSL repository fix14 Patch10 : rubygems-1.x.x-ssl-connection-don_t-revert.patch10 License: Ruby or MIT 11 12 @@ -52,6 +52,8 @@ 13 # https://github.com/rubygems/rubygems/issues/210 14 Patch109: rubygems-1.8.11-binary-extensions.patch 15 15 16 16 +Provides: scripts-rubygems = %{version}-%{release} 17 17 +Patch1000: rubygems-rails-require-thread.patch 18 + 19 Requires: ruby(abi) = 1.8 20 Requires: ruby >= 1.8.7 21 Requires: ruby-rdoc 22 @@ -83,6 +86,8 @@ 23 %patch7 -p1 -b .esc.skip 24 %patch10 -p1 -b .ssl 18 19 Requires: ruby(abi) = 1.9.1 20 Requires: rubygem(rdoc) >= 3.9.4 21 @@ -97,6 +99,8 @@ 22 %patch105 -p1 -b .uninst 23 %patch109 -p1 -b .bindir 25 24 26 25 +%patch1000 -p1 -b .thread -
trunk/server/fedora/specs/scripts-static-cat.spec
r2122 r2246 1 # For Haskell Packaging Guidelines see:2 # -https://fedoraproject.org/wiki/Packaging:Haskell3 # -https://fedoraproject.org/wiki/PackagingDrafts/Haskell1 # cabal2spec-0.25 2 # https://fedoraproject.org/wiki/Packaging:Haskell 3 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell 4 4 5 5 # Link Haskell libs statically for 3x faster startup speed. … … 13 13 Group: Applications/System 14 14 License: GPL 15 # BEGIN cabal2spec 15 16 URL: http://scripts.mit.edu/ 16 17 Source0: %{name}.tar.gz 17 # fedora ghc archs: 18 ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 19 BuildRequires: ghc-devel 20 # macros for building haskell packages 21 BuildRequires: ghc-rpm-macros >= 0.7.0 22 BuildRequires: ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel 18 ExclusiveArch: %{ghc_arches} 19 BuildRequires: ghc-Cabal-devel 20 BuildRequires: ghc-rpm-macros 21 # END cabal2spec 22 BuildRequires: ghc-bytestring-devel 23 BuildRequires: ghc-cgi-devel >= 3001.1.8 24 BuildRequires: ghc-containers-devel 25 BuildRequires: ghc-filepath-devel 26 BuildRequires: ghc-MonadCatchIO-mtl-devel 27 BuildRequires: ghc-old-locale-devel 28 BuildRequires: ghc-time-devel 29 BuildRequires: ghc-unix-devel 30 BuildRequires: ghc-unix-handle-devel 23 31 24 32 %description … … 39 47 40 48 %files 41 %defattr(-,root,root,-)42 49 %attr(755,root,root) %{_bindir}/static-cat 43 50 44 51 45 52 %changelog 53 * Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0-0 54 - regenerated packaging with cabal2spec-0.25.5 55 46 56 * Mon May 2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0 47 57 - regenerated packaging with cabal2spec-0.22.5
Note: See TracChangeset
for help on using the changeset viewer.