Changeset 2525


Ignore:
Timestamp:
May 26, 2014, 3:16:42 AM (10 years ago)
Author:
achernya
Message:
Modernize spec files for F20
Location:
branches/fc20-dev/server
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • branches/fc20-dev/server/common/oursrc/accountadm/Makefile.in

    r2299 r2525  
    1010all-local: admof
    1111
    12 admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread
     12admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread -lk5crypto
    1313admof: admof.o
    1414

  • branches/fc20-dev/server/common/patches/openafs-scripts.patch

    r2066 r2525  
    4646#
    4747diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
    48 index 7c7705e..0d0e94f 100644
     48index 03caf1c..699b2ce 100644
    4949--- a/src/afs/LINUX/osi_vnodeops.c
    5050+++ b/src/afs/LINUX/osi_vnodeops.c
    51 @@ -904,6 +904,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
     51@@ -1207,6 +1207,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
    5252        /* should we always update the attributes at this point? */
    5353        /* unlikely--the vcache entry hasn't changed */
    … …  
    7979 #ifdef notyet
    8080diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c
    81 index eabcfeb..6390850 100644
     81index feb0ca7..ba818c7 100644
    8282--- a/src/afs/VNOPS/afs_vnop_access.c
    8383+++ b/src/afs/VNOPS/afs_vnop_access.c
    … …  
    119119 }
    120120diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
    121 index b3931e5..71ef05c 100644
     121index d01aff2..0a38c1c 100644
    122122--- a/src/afs/VNOPS/afs_vnop_attrs.c
    123123+++ b/src/afs/VNOPS/afs_vnop_attrs.c
    … …  
    134134 #elif defined(AFS_DARWIN80_ENV)
    135135diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
    136 index 8e7af1c..7e984e9 100644
     136index 5d96f75..7957eee 100644
    137137--- a/src/afs/VNOPS/afs_vnop_lookup.c
    138138+++ b/src/afs/VNOPS/afs_vnop_lookup.c
    139 @@ -1877,6 +1877,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
     139@@ -1915,6 +1915,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
    140140     }
    141141 
    … …  
    151151        osi_FreeLargeSpace(tname);
    152152diff --git a/src/afs/afs.h b/src/afs/afs.h
    153 index fcc4c70..0d53af6 100644
     153index 88d5f77..61d3ee9 100644
    154154--- a/src/afs/afs.h
    155155+++ b/src/afs/afs.h
    … …  
    171171     afs_int32 flags;           /* things like O_SYNC, O_NONBLOCK go here */
    172172     char initd;                        /* if non-zero, Error fields meaningful */
    173 @@ -887,6 +895,7 @@ struct vcache {
    174  #ifdef AFS_SUN5_ENV
     173@@ -896,6 +904,7 @@ struct vcache {
    175174     struct afs_q multiPage;    /* list of multiPage_range structs */
    176175 #endif
     176     afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */
    177177+    int apache_access;         /* whether or not Apache has access to a file */
    178178 };
    … …  
    180180 #define        DONT_CHECK_MODE_BITS    0
    181181diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
    182 index 1834e6d..673a8e6 100644
     182index 2ecd38e..95aafcd 100644
    183183--- a/src/afs/afs_analyze.c
    184184+++ b/src/afs/afs_analyze.c
    185 @@ -368,7 +368,7 @@ afs_Analyze(struct afs_conn *aconn, afs_int32 acode,
     185@@ -478,7 +478,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,
    186186                         (afid ? afid->Fid.Volume : 0));
    187187        }
    … …  
    193193            areq->volumeError = VOLBUSY;
    194194diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
    195 index c888605..ff5cf2d 100644
     195index efce229..c1c1871 100644
    196196--- a/src/afs/afs_osi_pag.c
    197197+++ b/src/afs/afs_osi_pag.c
    … …  
    206206  * representation is '41XXXXXX' hex are used to represent the pags.
    207207@@ -484,6 +486,15 @@ afs_InitReq(struct vrequest *av, afs_ucred_t *acred)
    208         av->uid = afs_cr_uid(acred);    /* default when no pag is set */
     208        av->uid = afs_cr_ruid(acred);   /* default when no pag is set */
    209209 #endif
    210210     }
    … …  
    222222 
    223223diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
    224 index f282510..00f1360 100644
     224index e0a744d..c1c8c8c 100644
    225225--- a/src/afs/afs_pioctl.c
    226226+++ b/src/afs/afs_pioctl.c
    227 @@ -1406,6 +1406,10 @@ DECL_PIOCTL(PSetAcl)
     227@@ -1420,6 +1420,10 @@ DECL_PIOCTL(PSetAcl)
    228228     struct rx_connection *rxconn;
    229229     XSTATS_DECLS;
    … …  
    236236     if (!avc)
    237237        return EINVAL;
    238 @@ -1790,6 +1794,10 @@ DECL_PIOCTL(PSetTokens)
     238@@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens)
    239239     struct vrequest treq;
    240240     afs_int32 flag, set_parent_pag = 0;
    … …  
    247247     if (!afs_resourceinit_flag) {
    248248        return EIO;
    249 @@ -2231,6 +2239,11 @@ DECL_PIOCTL(PGetTokens)
     249@@ -2266,6 +2274,11 @@ DECL_PIOCTL(PGetTokens)
    250250     int newStyle;
    251251     int code = E2BIG;
    … …  
    259259     if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
    260260        return EIO;             /* Inappropriate ioctl for device */
    261 @@ -2341,6 +2354,10 @@ DECL_PIOCTL(PUnlog)
     261@@ -2376,6 +2389,10 @@ DECL_PIOCTL(PUnlog)
    262262     afs_int32 i;
    263263     struct unixuser *tu;

  • branches/fc20-dev/server/fedora/Makefile

    r2522 r2525  
    2020
    2121upstream_yum    = krb5 krb5.i686 httpd openssh
    22 hackage         = cgi-3001.1.8.2 unix-handle-0.0.0
     22hackage         = cgi-3001.1.8.5 unix-handle-0.0.0
    2323upstream_hackage = ghc-cgi ghc-unix-handle
    2424gems            = pony:1.8
    … …  
    4040
    4141dload           = ${PWD}/.dload
    42 openafs_url     = "https://www.openafs.org/dl/openafs/1.6.5.1/openafs-1.6.5.1-1.src.rpm"
    43 zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
     42openafs_url     = "https://www.openafs.org/dl/openafs/1.6.8/openafs-1.6.8-1.src.rpm"
     43#zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4444
    4545PKG             = $(patsubst %.i686,%,$@)
    … …  
    6969        cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
    7070        wget -P $(dload) $(openafs_url)
    71         wget -P $(dload) $(zephyr_url)
     71        #wget -P $(dload) $(zephyr_url)
    7272        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
    7373        cabal update
    … …  
    7575        cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
    7676        $(foreach gem, $(gems), gem fetch $(firstword $(subst :, ,$(gem))) -v $(lastword $(subst :, ,$(gem)));)
     77        spectool -g -R $(specs)/zephyr.spec
    7778        spectool -g -R $(specs)/python-zephyr.spec
    7879        spectool -g -R $(specs)/python-afs.spec
    … …  
    151152        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    152153        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    153         /usr/bin/mock -r scripts-fc19-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     154        /usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    154155
    155156$(filter-out %.i686,$(oursrc)): %: setup
    156157        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    157158        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    158         /usr/bin/mock -r scripts-fc19-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     159        /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    159160
    160161$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
    … …  
    164165$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    165166        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    166         /usr/bin/mock -r scripts-fc19-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     167        /usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    167168
    168169$(filter-out %.i686,$(upstream)): %: setup patch-specs
    169170        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    170         /usr/bin/mock -r scripts-fc19-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     171        /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    171172
    172173openafs-kernel: setup
    173174        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    174175        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    175         /usr/bin/mock -r scripts-fc19-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     176        /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    176177
    177178#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong

  • branches/fc20-dev/server/fedora/specs/discuss.spec

    r2388 r2525  
    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

  • branches/fc20-dev/server/fedora/specs/ghc-cgi.spec

    r2246 r2525  
    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

  • branches/fc20-dev/server/fedora/specs/ghc-unix-handle.spec

    r2246 r2525  
    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

  • branches/fc20-dev/server/fedora/specs/httpd.spec.patch

    r2462 r2525  
    1 --- httpd.spec.orig     2013-08-22 16:53:46.414957922 -0400
    2 +++ httpd.spec  2013-08-22 16:53:54.456957922 -0400
    3 @@ -14,7 +14,7 @@
     1--- httpd.spec.orig     2014-05-25 18:59:21.318657218 -0400
     2+++ httpd.spec  2014-05-25 19:00:15.324430542 -0400
     3@@ -15,7 +15,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.4.6
     6 Version: 2.4.9
    77-Release: 2%{?dist}
    88+Release: 2%{?dist}.scripts.%{scriptsversion}
    … …  
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -83,6 +83,12 @@
    13  Requires(postun): systemd-units
     12@@ -86,6 +86,12 @@
    1413 Requires(post): systemd-units
     14 Conflicts: apr < 1.5.0-1
    1515 
    1616+Provides: scripts-httpd = %{version}-%{release}
    … …  
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -93,6 +99,7 @@
     25@@ -96,6 +102,7 @@
    2626 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2727 Requires: apr-devel, apr-util-devel, pkgconfig
    … …  
    3131 %description devel
    3232 The httpd-devel package contains the APXS binary and other files
    33 @@ -131,6 +138,7 @@
     33@@ -134,6 +141,7 @@
    3434 Requires(post): openssl, /bin/cat
    3535 Requires(pre): httpd
    … …  
    3939 
    4040 %description -n mod_ssl
    41 @@ -197,6 +205,11 @@
     41@@ -200,6 +208,11 @@
    4242 # Prevent use of setcap in "install-suexec-caps" target.
    4343 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    … …  
    5151 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5252 if test "x${vmmn}" != "x%{mmn}"; then
    53 @@ -243,11 +256,13 @@
     53@@ -246,11 +259,13 @@
    5454        --enable-suexec --with-suexec \
    5555         --enable-suexec-capabilities \

  • branches/fc20-dev/server/fedora/specs/krb5.spec.patch

    r2454 r2525  
    1 --- krb5.spec.orig      2013-07-31 21:02:28.141225784 -0400
    2 +++ krb5.spec   2013-07-31 21:02:49.548225784 -0400
    3 @@ -30,7 +30,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.11.3
    7 -Release: 2%{?dist}
    8 +Release: 2%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.11.5
     7-Release: 5%{?dist}
     8+Release: 5%{?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.11/krb5-1.11.3-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 @@ -90,6 +90,8 @@
    13  Patch201: krb5-1.11.2-keycheck.patch
    14  Patch202: krb5-1.11.2-otp.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 @@ -176,6 +178,7 @@
     21@@ -232,6 +234,7 @@
    2222 %package libs
    2323 Summary: The shared libraries used by Kerberos 5
    … …  
    2727 # Some of the older libsmbclient builds here incorrectly called
    2828 # krb5_locate_kdc(), which was mistakenly exported in 1.9.
    29 @@ -315,6 +318,7 @@
     29@@ -410,6 +413,8 @@
     30 %patch203 -p1 -b .otp2
     31 %patch204 -p1 -b .move-otp-sockets
    3032 
    31  %patch201 -p1 -b .keycheck
    32  %patch202 -p1 -b .otp
    33 +%patch1000 -p1 -b .kuserok 
    34  
     33+%patch1000 -p1 -b .kuserok
     34+
    3535 # Take the execute bit off of documentation.
    3636 chmod -x doc/krb5-protocol/*.txt
     37 

  • branches/fc20-dev/server/fedora/specs/openafs.spec.patch

    r2522 r2525  
    1 --- openafs.spec.orig   2013-10-12 19:05:58.632374808 -0400
    2 +++ openafs.spec        2013-10-12 19:04:29.539206726 -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.5.1
     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.*

  • branches/fc20-dev/server/fedora/specs/openssh.spec.patch

    r2429 r2525  
    1 --- openssh.spec.orig   2013-05-01 19:02:52.961058569 -0400
    2 +++ openssh.spec        2013-05-01 19:15:58.952058569 -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
    … …  
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    1111 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    12 @@ -187,6 +187,7 @@
    13  # add latest config.{sub,guess} to support aarch64 (#926284)
    14  Patch907: openssh-6.2p1-aarch64.patch
     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
    1515 
    1616+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    … …  
    1818 License: BSD
    1919 Group: Applications/Internet
    20 @@ -238,6 +239,7 @@
    21  Group: Applications/Internet
    22  Requires: openssh = %{version}-%{release}
     20@@ -254,6 +255,7 @@
     21 Requires(pre): /usr/sbin/useradd
     22 Requires: pam >= 1.0.1-3
    2323 Requires: fipscheck-lib%{_isa} >= 1.3.0
    2424+Provides: scripts-openssh-server
    25  
    26  %package server
    27  Summary: An open source SSH server daemon
    28 @@ -407,10 +409,12 @@
     25 Requires(post): systemd-units
     26 Requires(preun): systemd-units
     27 Requires(postun): systemd-units
     28@@ -411,10 +413,12 @@
    2929 %patch713 -p1 -b .ctr-cavs
    3030 
    … …  
    3636 %patch900 -p1 -b .canohost
    3737-%patch901 -p1 -b .kuserok
    38 +# Remove the kuserok patch as it won't apply without patch800 
     38+# Remove the kuserok patch as it won't apply without patch800
    3939+# %patch901 -p1 -b .kuserok
    40  %patch905 -p1 -b .modpipe-cflags
    41  %patch906 -p1 -b .identityfile
    42  %patch907 -p1 -b .aarch64
    43 @@ -419,6 +423,8 @@
     40 %patch902 -p1 -b .ccache_name
     41 %patch903 -p1 -b .dh
     42 %patch904 -p1 -b .SP800-131A
     43@@ -428,6 +432,8 @@
    4444 # Nothing here yet
    4545 %endif

  • branches/fc20-dev/server/fedora/specs/rubygem-pony.spec

    r2522 r2525  
    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

  • branches/fc20-dev/server/fedora/specs/scripts-static-cat.spec

    r2246 r2525  
    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

  • branches/fc20-dev/server/fedora/specs/zephyr.spec

    r2209 r2525  
    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
Note: See TracChangeset for help on using the changeset viewer.