Ignore:
Timestamp:
Aug 27, 2014, 10:06:17 PM (10 years ago)
Author:
achernya
Message:
Reintegrate fc20-dev into trunk
Location:
trunk
Files:
4 deleted
14 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/server/fedora/specs/accountadm.spec

    r2300 r2591  
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
    1111BuildRequires: scripts-openafs-devel, scripts-openafs-authlibs-devel
    12 BuildRequires: hesinfo
     12BuildRequires: hesiod
    1313BuildRequires: openldap-clients
    1414BuildRequires: krb5-devel
    1515BuildRequires: sudo
    16 Requires: hesinfo
     16Requires: hesiod
    1717Requires: openldap-clients
    1818Requires: sudo

  • trunk/server/fedora/specs/discuss.spec

    r2388 r2591  
    11# Make sure to update this to coincide with the most recent debathena-discuss
    22# release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
    3 %define upstreamversion 10.0.15
     3%define upstreamversion 10.0.17
    44Name:           discuss
    55Version:        %{upstreamversion}
    … …  
    2121
    2222%prep
    23 %setup -q -n debathena-%{name}-%{upstreamversion}
     23%setup -q -n %{name}-%{upstreamversion}
    2424
    2525%build
    … …  
    3030automake --add-missing --foreign || :
    3131%configure --without-krb4 --with-krb5 --with-zephyr --with-pager=/usr/bin/less
    32 make %{?_smp_mflags}
     32#make %{?_smp_mflags}
     33make
    3334
    3435%install
    … …  
    5657%{_bindir}/dspipe
    5758%{_bindir}/mkds
    58 %{_bindir}/pmtg
    5959%{_bindir}/rmds
    6060%{_libexecdir}/edsc
    … …  
    9999%attr(755,discuss,discuss) %{_localstatedir}/spool/discuss
    100100%attr(644,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
     101%{_libexecdir}/disdebug
     102%{_libexecdir}/expunge
     103%{_libexecdir}/recover
    101104
    102105%pre server
    … …  
    108111
    109112%changelog
     113* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 10.0.17-1
     114- Update to discuss 10.0.17
     115
    110116* Tue Mar 19 2013 Alexander Chernyakhovsky <achernya@mit.edu> - 10.0.15-1
    111117- Update to discuss 10.0.15

  • trunk/server/fedora/specs/ghc-cgi.spec

    r2246 r2591  
    1 # cabal2spec-0.25
     1# Generated with cabal-rpm
    22# https://fedoraproject.org/wiki/Packaging:Haskell
    3 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    43
    54%global pkg_name cgi
    65
    7 %global common_summary Haskell %{pkg_name} library
     6Name:           ghc-%{pkg_name}
     7Version:        3001.1.8.5
     8Release:        0.%{scriptsversion}%{?dist}
     9Summary:        A library for writing CGI programs
    810
    9 %global common_description A %{pkg_name} library for Haskell.
    10 
    11 Name:           ghc-%{pkg_name}
    12 Version:        3001.1.8.2
    13 Release:        0.%{scriptsversion}%{?dist}
    14 Summary:        %{common_summary}
    15 
    16 Group:          System Environment/Libraries
    1711License:        BSD
    18 # BEGIN cabal2spec
    1912URL:            http://hackage.haskell.org/package/%{pkg_name}
    2013Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    21 ExclusiveArch:  %{ghc_arches}
     14
    2215BuildRequires:  ghc-Cabal-devel
    2316BuildRequires:  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
     17# Begin cabal-rpm deps:
     18BuildRequires:  ghc-MonadCatchIO-mtl-devel
     19BuildRequires:  ghc-containers-devel
     20BuildRequires:  ghc-mtl-devel
     21BuildRequires:  ghc-network-devel
     22BuildRequires:  ghc-old-locale-devel
     23BuildRequires:  ghc-old-time-devel
     24BuildRequires:  ghc-parsec-devel
     25BuildRequires:  ghc-xhtml-devel
     26# End cabal-rpm deps
    3027
    3128%description
    32 %{common_description}
     29This is a Haskell library for writing CGI programs.
     30
     31
     32%package devel
     33Summary:        Haskell %{pkg_name} library development files
     34Provides:       %{name}-static = %{version}-%{release}
     35Requires:       ghc-compiler = %{ghc_version}
     36Requires(post): ghc-compiler = %{ghc_version}
     37Requires(postun): ghc-compiler = %{ghc_version}
     38Requires:       %{name}%{?_isa} = %{version}-%{release}
     39
     40%description devel
     41This package provides the Haskell %{pkg_name} library development files.
    3342
    3443
    … …  
    4554
    4655
    47 # devel subpackage
    48 %ghc_devel_package
    49 
    50 %ghc_devel_description
     56%post devel
     57%ghc_pkg_recache
    5158
    5259
    53 %ghc_devel_post_postun
     60%postun devel
     61%ghc_pkg_recache
    5462
    5563
    56 %ghc_files LICENSE
     64%files -f %{name}.files
     65%doc LICENSE
     66
     67
     68%files devel -f %{name}-devel.files
    5769
    5870
    5971%changelog
     72* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.5-0
     73- Updated packaging for F20, with cabal-rpm
     74
    6075* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.2-0
    6176- regenerated packaging with cabal2spec-0.25.5

  • trunk/server/fedora/specs/ghc-unix-handle.spec

    r2246 r2591  
    1 # cabal2spec-0.25
    21# https://fedoraproject.org/wiki/Packaging:Haskell
    3 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    42
    53%global pkg_name unix-handle
    6 
    7 %global common_summary Haskell %{pkg_name} library
    8 
    9 %global common_description A %{pkg_name} library for Haskell.
    104
    115Name:           ghc-%{pkg_name}
    126Version:        0.0.0
    137Release:        0.%{scriptsversion}%{?dist}
    14 Summary:        %{common_summary}
     8Summary:        POSIX operations on Handles
    159
    16 Group:          System Environment/Libraries
    1710License:        BSD
    18 # BEGIN cabal2spec
    1911URL:            http://hackage.haskell.org/package/%{pkg_name}
    2012Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    21 ExclusiveArch:  %{ghc_arches}
     13
    2214BuildRequires:  ghc-Cabal-devel
    2315BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
    24 # END cabal2spec
     16# Begin cabal-rpm deps:
     17BuildRequires:  ghc-unix-devel
     18# End cabal-rpm deps
    2519
    2620%description
    27 %{common_description}
     21This package provides versions of functions from "System.Posix.Files" that
     22operate on 'System.IO.Handle' instead of 'System.IO.FilePath' or
     23'System.Posix.Fd'. This is useful to prevent race conditions that may arise
     24from looking up the same path twice.
     25
     26
     27%package devel
     28Summary:        Haskell %{pkg_name} library development files
     29Provides:       %{name}-static = %{version}-%{release}
     30Requires:       ghc-compiler = %{ghc_version}
     31Requires(post): ghc-compiler = %{ghc_version}
     32Requires(postun): ghc-compiler = %{ghc_version}
     33Requires:       %{name}%{?_isa} = %{version}-%{release}
     34
     35%description devel
     36This package provides the Haskell %{pkg_name} library development files.
    2837
    2938
    … …  
    4049
    4150
    42 # devel subpackage
    43 %ghc_devel_package
    44 
    45 %ghc_devel_description
     51%post devel
     52%ghc_pkg_recache
    4653
    4754
    48 %ghc_devel_post_postun
     55%postun devel
     56%ghc_pkg_recache
    4957
    5058
    51 %ghc_files LICENSE
     59%files -f %{name}.files
     60%doc LICENSE
     61
     62
     63%files devel -f %{name}-devel.files
    5264
    5365
    5466%changelog
     67* Mon May 26 2014 Alex Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
     68- Updated packaging for F20 with cabal-rpm
     69
    5570* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
    5671- regenerated packaging with cabal2spec-0.25.5

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

    r2377 r2591  
    1 --- /tmp/httpd/httpd.spec.orig  2013-02-14 17:53:29.967176396 -0500
    2 +++ /tmp/httpd/httpd.spec       2013-02-14 17:54:57.172521444 -0500
    3 @@ -9,7 +9,7 @@
     1--- rpmbuild/SPECS/httpd.spec.~1~       2014-07-23 06:24:15.000000000 -0400
     2+++ httpd.spec  2014-08-26 21:10:34.994027237 -0400
     3@@ -15,7 +15,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.23
     6 Version: 2.4.10
    77-Release: 1%{?dist}
    88+Release: 1%{?dist}.scripts.%{scriptsversion}
    … …  
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -57,6 +57,15 @@
    13  Requires(postun): systemd-units
    14  Requires(post): systemd-units
    15  
     12@@ -65,6 +65,13 @@
     13 # Bug fixes
     14 Patch55: httpd-2.4.4-malformed-host.patch
     15 Patch56: httpd-2.4.4-mod_unique_id.patch
     16+
     17+Patch1001: httpd-suexec-scripts.patch
     18+Patch1002: httpd-mod_status-security.patch
     19+Patch1003: httpd-304s.patch
     20+Patch1004: httpd-fixup-vhost.patch
     21+Patch1005: httpd-allow-null-user.patch
     22+
     23 License: ASL 2.0
     24 Group: System Environment/Daemons
     25 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
     26@@ -77,6 +84,7 @@
     27 Provides: webserver
     28 Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
     29 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
    1630+Provides: scripts-httpd = %{version}-%{release}
    17 +Patch1000: httpd-suexec-scripts.patch
    18 +Patch1003: httpd-2.2.x-mod_status-security.patch
    19 +Patch1004: httpd-2.2.x-304.patch
    20 +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
    21 +Patch1006: httpd-suexec-cloexec.patch
    22 +Patch1007: httpd-fixup-vhost.patch
    23 +Patch1008: httpd-SSLCompression.patch
    24 +
    25  %description
    26  The Apache HTTP Server is a powerful, efficient, and extensible
    27  web server.
    28 @@ -67,6 +76,7 @@
     31 Requires: httpd-tools = %{version}-%{release}
     32 Requires(pre): /usr/sbin/useradd
     33 Requires(preun): systemd-units
     34@@ -94,6 +102,7 @@
    2935 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    3036 Requires: apr-devel, apr-util-devel, pkgconfig
    … …  
    3440 %description devel
    3541 The httpd-devel package contains the APXS binary and other files
    36 @@ -105,6 +115,7 @@
     42@@ -132,6 +141,7 @@
    3743 Requires(post): openssl, /bin/cat
    3844 Requires(pre): httpd
    … …  
    4248 
    4349 %description -n mod_ssl
    44 @@ -131,6 +142,14 @@
    45  # Patch in vendor/release string
    46  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     50@@ -190,6 +200,12 @@
     51 %patch55 -p1 -b .malformedhost
     52 %patch56 -p1 -b .uniqueid
    4753 
    48 +%patch1000 -p1 -b .scripts
    49 +%patch1003 -p1 -b .permitstatus
    50 +%patch1004 -p1 -b .scripts-304
    51 +%patch1005 -p1 -b .ssl-sessioncache
    52 +%patch1006 -p1 -b .cloexec
    53 +%patch1007 -p1 -b .fixup-vhost
    54 +%patch1008 -p1 -b .sslcompression
     54+%patch1001 -p1 -b .suexec-scripts
     55+%patch1002 -p1 -b .mod_status-security
     56+%patch1003 -p1 -b .scripts-304s
     57+%patch1004 -p1 -b .fixup-vhost
     58+%patch1005 -p1 -b .allow-null-user
    5559+
    56  # Safety check: prevent build if defined MMN does not equal upstream MMN.
    57  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    58  if test "x${vmmn}" != "x%{mmn}"; then
    59 @@ -191,10 +210,12 @@
    60          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
     60 # Patch in the vendor string
     61 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
     62 
     63@@ -242,11 +258,13 @@
    6164        --enable-suexec --with-suexec \
     65         --enable-suexec-capabilities \
    6266        --with-suexec-caller=%{suexec_caller} \
    63 -       --with-suexec-docroot=%{contentdir} \
     67-       --with-suexec-docroot=%{docroot} \
     68-       --without-suexec-logfile \
     69-        --with-suexec-syslog \
    6470+       --with-suexec-docroot=/ \
    6571+       --with-suexec-userdir=web_scripts \
    6672+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    67         --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     73+       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     74+        --without-suexec-syslog \
    6875        --with-suexec-bin=%{_sbindir}/suexec \
    6976-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
    … …  
    7178         --enable-pie \
    7279         --with-pcre \
    73         $*
     80         --enable-mods-shared=all \
     81@@ -542,7 +560,8 @@
     82 %{_sbindir}/fcgistarter
     83 %{_sbindir}/apachectl
     84 %{_sbindir}/rotatelogs
     85-%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
     86+# cap_dac_override needed to write to /var/log/httpd
     87+%caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
     88 
     89 %dir %{_libdir}/httpd
     90 %dir %{_libdir}/httpd/modules
     91@@ -1014,3 +1033,8 @@
     92 * Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
     93 - update to 2.2.15 (#572404, #579311)
     94 
     95+Patch1001: httpd-suexec-scripts.patch
     96+Patch1002: httpd-mod_status-security.patch
     97+Patch1003: httpd-304s.patch
     98+Patch1004: httpd-fixup-vhost.patch
     99+Patch1005: httpd-allow-null-user.patch

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

    r2416 r2591  
    1 --- krb5.spec.orig      2013-05-23 18:04:40.738088099 -0400
    2 +++ krb5.spec   2013-05-23 18:08:02.592147349 -0400
    3 @@ -20,7 +20,7 @@
     1--- krb5.spec.orig      2014-05-25 19:01:13.701141912 -0400
     2+++ krb5.spec   2014-05-25 19:02:11.438816630 -0400
     3@@ -41,7 +41,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.10.2
    7 -Release: 12%{?dist}
    8 +Release: 12%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.11.5
     7-Release: 11%{?dist}
     8+Release: 11%{?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.10/krb5-1.10.2-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.5-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -77,6 +77,8 @@
    13  Patch113: krb5-fast-msg_type.patch
    14  Patch114: krb5-1.11.2-kpasswd_pingpong.patch
     12@@ -143,6 +143,8 @@
     13 Patch405: 0005-Be-more-careful-of-target-ccache-collections.patch
     14 Patch406: 0006-Copy-config-entries-to-the-target-ccache.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
    … …  
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -134,6 +136,7 @@
     21@@ -232,6 +234,7 @@
    2222 %package libs
    2323 Summary: The shared libraries used by Kerberos 5
    2424 Group: System Environment/Libraries
    2525+Provides: scripts-krb5-libs, scripts-krb5-libs%{?_isa}
     26 %if 0%{?rhel} == 6
     27 # Some of the older libsmbclient builds here incorrectly called
     28 # krb5_locate_kdc(), which was mistakenly exported in 1.9.
     29@@ -410,6 +413,8 @@
     30 %patch203 -p1 -b .otp2
     31 %patch204 -p1 -b .move-otp-sockets
    2632 
    27  %description libs
    28  Kerberos is a network authentication system. The krb5-libs package
    29 @@ -261,6 +264,7 @@
    30  %patch112 -p1 -b .CVE-2013-1416
    31  %patch113 -p1 -b .fast-msg_type
    32  %patch114 -p1 -b .kpasswd_pingpong
    3333+%patch1000 -p1 -b .kuserok
    34  rm src/lib/krb5/krb/deltat.c
     34+
     35 # Take the execute bit off of documentation.
     36 chmod -x doc/krb5-protocol/*.txt
    3537 
    36  gzip doc/*.ps

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

    r2504 r2591  
    1 --- openafs.spec.orig   2013-06-24 04:40:31.000000000 -0400
    2 +++ openafs.spec        2013-07-18 22:43:10.631044261 -0400
     1--- openafs.spec.orig   2014-05-25 21:15:54.539027644 -0400
     2+++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
    33@@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.4
     4 %define pkgvers 1.6.8
    55 # for beta/rc releases make pkgrel 0.<tag>
    66 # for real releases make pkgrel 1 (or more for extra releases)
    … …  
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -249,9 +249,16 @@
     12@@ -249,9 +249,15 @@
    1313 %if %{build_modules}
    1414 BuildRequires: kernel-devel
    … …  
    2121+Patch1002: openafs-systemd-crond.patch
    2222+Patch1003: openafs-systemd-csdb.patch
    23 +Patch1004: openafs-d_drop.patch
    2423+%define _default_patch_fuzz 2
    2524+
    … …  
    3332+Provides: scripts-openafs-client
    3433 Requires: binutils, openafs = %{version}
    35  %if 0%{?fedora} >= 15
     34 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
    3635 Requires: systemd-units
    3736@@ -382,6 +389,7 @@
    … …  
    9291 %else
    9392 
    94 @@ -698,6 +711,12 @@
     93@@ -698,6 +711,11 @@
    9594 #%setup -q -n %{srcdir}
    9695 %setup -q -b 1 -n %{srcdir}
    … …  
    10099+%patch1002 -p1 -b .systemd-crond
    101100+%patch1003 -p1 -b .systemd-csdb
    102 +%patch1004 -p1 -b .d_drop
    103101+
    104102 ##############################################################################
    105103 #
    106104 # building
    107 @@ -869,6 +887,8 @@
     105@@ -871,6 +889,8 @@
    108106 %endif
    109107 %endif
    … …  
    114112        --prefix=%{_prefix} \
    115113        --libdir=%{_libdir} \
    116 @@ -1257,6 +1277,13 @@
     114@@ -1267,6 +1287,13 @@
    117115 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    118116 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*

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

    r2450 r2591  
    1 --- openssh.spec.orig   2013-07-15 21:14:52.452894092 -0400
    2 +++ openssh.spec        2013-07-15 21:18:59.494168115 -0400
    3 @@ -74,7 +74,7 @@
     1--- openssh.spec.orig   2014-05-25 19:03:45.308703615 -0400
     2+++ openssh.spec        2014-05-25 19:05:57.593843283 -0400
     3@@ -71,7 +71,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    … …  
    99 URL: http://www.openssh.com/portable.html
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    11  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    12 @@ -220,7 +220,7 @@
    13  Patch904: openssh-5.9p1-change-max-startups.patch
    14  # make sftp's libedit interface marginally multibyte aware (#841771)
    15  Patch908: openssh-5.9p1-sftp-multibyte.patch
    16 -
     11 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
     12@@ -196,6 +196,7 @@
     13 # ignore environment variables with embedded '=' or '\0' characters (#1077843)
     14 Patch909: openssh-6.4p1-ignore-bad-env-var.patch
     15 
    1716+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    1817 
    1918 License: BSD
    2019 Group: Applications/Internet
    21 @@ -271,6 +273,7 @@
    22  Group: Applications/Internet
    23  Requires: openssh = %{version}-%{release}
     20@@ -254,6 +255,7 @@
     21 Requires(pre): /usr/sbin/useradd
     22 Requires: pam >= 1.0.1-3
    2423 Requires: fipscheck-lib%{_isa} >= 1.3.0
    2524+Provides: scripts-openssh-server
    26  
    27  %package server
    28  Summary: An open source SSH server daemon
    29 @@ -458,10 +461,12 @@
    30  %patch714 -p0 -b .null-xcrypt
     25 Requires(post): systemd-units
     26 Requires(preun): systemd-units
     27 Requires(postun): systemd-units
     28@@ -411,10 +413,12 @@
     29 %patch713 -p1 -b .ctr-cavs
    3130 
    3231 %patch800 -p1 -b .gsskex
    … …  
    3938+# Remove the kuserok patch as it won't apply without patch800
    4039+# %patch901 -p1 -b .kuserok
    41  %patch902 -p1 -b .man-moduli
    42  %patch903 -p1 -b .ipqos
    43  %patch904 -p1 -b .max-startups
    44 @@ -471,6 +476,8 @@
     40 %patch902 -p1 -b .ccache_name
     41 %patch903 -p1 -b .dh
     42 %patch904 -p1 -b .SP800-131A
     43@@ -428,6 +432,8 @@
    4544 # Nothing here yet
    4645 %endif

  • trunk/server/fedora/specs/rubygem-pony.spec

    r2509 r2591  
    11# Generated from pony-1.8.gem by gem2rpm -*- rpm-spec -*-
    22%global gem_name pony
    3 %global rubyabi 1.9.1
    43
    54Name: rubygem-%{gem_name}
    65Version: 1.8
    7 Release: 1%{?dist}.scripts.%{scriptsversion}
     6Release: 2%{?dist}.scripts.%{scriptsversion}
    87Summary: Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')
    98Group: Development/Languages
    … …  
    1110URL: http://github.com/benprew/pony
    1211Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
    13 Requires: ruby(abi) = %{rubyabi}
     12Requires: ruby(release)
    1413Requires: ruby(rubygems)
    1514Requires: rubygem(mail) >= 2.0
    16 BuildRequires: ruby(abi) = %{rubyabi}
     15BuildRequires: ruby(release)
    1716BuildRequires: rubygems-devel
    1817BuildRequires: ruby
    … …  
    7271
    7372%changelog
     73* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 1.8-2
     74- Update for Fedora 20
     75
    7476* Sun Mar 09 2014 Benjamin Tidor <btidor@mit.edu> - 1.8-1
    7577- Initial package

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

    r2376 r2591  
    2222Requires: scripts-openssh-server
    2323Requires: scripts-static-cat
    24 Requires: scripts-rubygems
    2524Requires: sql-signup
    2625Requires: tokensys

  • trunk/server/fedora/specs/scripts-static-cat.spec

    r2246 r2591  
    1 # cabal2spec-0.25
    21# https://fedoraproject.org/wiki/Packaging:Haskell
    3 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    42
    53# Link Haskell libs statically for 3x faster startup speed.
    … …  
    119Summary:        static-cat for scripts.mit.edu
    1210
    13 Group:          Applications/System
    14 License:        GPL
    15 # BEGIN cabal2spec
     11License:        GPL+
    1612URL:            http://scripts.mit.edu/
    1713Source0:        %{name}.tar.gz
    18 ExclusiveArch:  %{ghc_arches}
     14
    1915BuildRequires:  ghc-Cabal-devel
    2016BuildRequires:  ghc-rpm-macros
    21 # END cabal2spec
     17# Begin cabal-rpm deps:
     18BuildRequires:  ghc-MonadCatchIO-mtl-devel
    2219BuildRequires:  ghc-bytestring-devel
    23 BuildRequires:  ghc-cgi-devel >= 3001.1.8
     20BuildRequires:  ghc-cgi-devel
    2421BuildRequires:  ghc-containers-devel
    2522BuildRequires:  ghc-filepath-devel
    26 BuildRequires:  ghc-MonadCatchIO-mtl-devel
    2723BuildRequires:  ghc-old-locale-devel
    2824BuildRequires:  ghc-time-devel
    2925BuildRequires:  ghc-unix-devel
    3026BuildRequires:  ghc-unix-handle-devel
     27# End cabal-rpm deps
    3128
    3229%description
    … …  
    5148
    5249%changelog
     50* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0
     51- Updated for F20 with cabal-rpm
     52
    5353* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0-0
    5454- regenerated packaging with cabal2spec-0.25.5

  • trunk/server/fedora/specs/zephyr.spec

    r2209 r2591  
    11Name:           zephyr
    2 Version:        3.0.2
     2Version:        3.1.2
     3%define commit 54c6b84a81301a1691f9bec10c63c1e36166df9d
     4%define shortcommit %(c=%{commit}; echo ${c:0:7})
    35Release:        0.%{scriptsversion}%{?dist}
    46Summary:        Client programs for the Zephyr real-time messaging system
    … …  
    79License:        MIT
    810URL:            http://zephyr.1ts.org/
    9 Source0:        http://zephyr.1ts.org/export/HEAD/distribution/%{name}-%{version}.tar.gz
     11Source0:        https://github.com/zephyr-im/zephyr/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
    1012Source1:        zhm.init
    1113BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    … …  
    5961
    6062%prep
    61 %setup -q
     63%setup -q -n %{name}-%{commit}
    6264cp -p %{SOURCE1} .
    6365
    … …  
    142144%{_libdir}/*.so
    143145%{_includedir}/*
    144 
     146%{_libdir}/pkgconfig/zephyr.pc
    145147
    146148%changelog
     149* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 3.1.2-0
     150- Update to Zephyr 3.1.2, fix packaging for F20
     151
    147152* Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> 3.0.1-0
    148153- Zephyr 3.0.1

  • trunk/server/fedora/specs/zhm.init

    r2561 r2591  
    1414### BEGIN INIT INFO
    1515# Provides: zhm
    16 # Required-Start: $local_fs $remote_fs $network $named
    17 # Required-Stop: $local_fs $remote_fs $network
     16# Required-Start: $local_fs $network $named
     17# Required-Stop: $local_fs $network
    1818# Default-Start: 2 3 4 5
    1919# Default-Stop: 0 1 6
Note: See TracChangeset for help on using the changeset viewer.