Index: trunk/server/fedora/specs/curl.spec.patch =================================================================== --- trunk/server/fedora/specs/curl.spec.patch (revision 2014) +++ (revision ) @@ -1,57 +1,0 @@ ---- curl.spec.orig 2011-07-01 16:31:16.000000000 -0400 -+++ curl.spec 2011-07-01 16:30:24.000000000 -0400 -@@ -1,7 +1,7 @@ - Summary: A utility for getting files from remote servers (FTP, HTTP, and others) - Name: curl - Version: 7.20.1 --Release: 5%{?dist} -+Release: 5.scripts.%{scriptsversion}%{?dist} - License: MIT - Group: Applications/Internet - Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma -@@ -90,6 +90,9 @@ - # workaround for broken applications using curl multi (#599340) - Patch108: 0108-curl-7.20.1-threaded-dns-multi.patch - -+# disable credential delegation over Negotiate (CVE-2011-2192) -+Patch1000: curl-gssapi-delegation.patch -+ - Provides: webclient - URL: http://curl.haxx.se/ - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -@@ -190,6 +193,7 @@ - %patch105 -p1 - %patch106 -p1 - %patch108 -p1 -+%patch1000 -p1 - - # other patches - %patch15 -p1 -@@ -225,16 +229,6 @@ - - make %{?_smp_mflags} - --%check --LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} --export LD_LIBRARY_PATH --cd tests --make %{?_smp_mflags} -- --# use different port range for 32bit and 64bit build, thus make it possible --# to run both in parallel on the same machine --./runtests.pl -a -b%{?__isa_bits}90 -p -v -- - %install - rm -rf $RPM_BUILD_ROOT - -@@ -289,6 +283,10 @@ - %{_datadir}/aclocal/libcurl.m4 - - %changelog -+* Fri Jul 01 2011 Geoffrey Thomas 7.20.1-5.scripts -+- disable credential delegation over Negotiate (CVE-2011-2192) -+ Patch from upstream: http://curl.haxx.se/docs/adv_20110623.html -+ - * Fri Nov 26 2010 Kamil Dudka 7.20.1-5 - - do not send QUIT to a dead FTP control connection (#650255) - - prevent FTP client from hanging on unrecognized ABOR response (#649347) Index: trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec =================================================================== --- trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 2014) +++ trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 2066) @@ -1,21 +1,22 @@ +# 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: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) %global ghc_pkg_deps ghc-mtl-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -Version: 0.3.0.1 +Version: 0.3.0.2 Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} @@ -23,11 +24,12 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +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,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %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 +* Mon May 2 2011 Alexander Chernyakhovsky - 0.3.0.2-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 0.3.0.1-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/ghc-cgi.spec =================================================================== --- trunk/server/fedora/specs/ghc-cgi.spec (revision 2014) +++ trunk/server/fedora/specs/ghc-cgi.spec (revision 2066) @@ -1,21 +1,22 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name cgi +# 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: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) %global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -Version: 3001.1.8.1 +Version: 3001.1.8.2 Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} @@ -23,11 +24,12 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +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,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %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 +* Mon May 2 2011 Alexander Chernyakhovsky - 3001.1.8.2-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 3001.1.8.1-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2014) +++ trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2066) @@ -1,18 +1,19 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name unix-handle +# 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: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel - -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} Name: ghc-%{pkg_name} @@ -23,11 +24,12 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +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,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %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 +* Mon May 2 2011 Alexander Chernyakhovsky - 0.0.0-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 0.0.0-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/httpd.spec.patch =================================================================== --- trunk/server/fedora/specs/httpd.spec.patch (revision 2014) +++ trunk/server/fedora/specs/httpd.spec.patch (revision 2066) @@ -1,18 +1,18 @@ ---- httpd.spec.orig 2010-10-27 08:26:15.000000000 -0400 -+++ httpd.spec 2010-11-18 18:20:43.000000000 -0500 -@@ -7,7 +7,7 @@ +--- httpd.spec.orig 2011-09-13 09:43:36.000000000 -0400 ++++ httpd.spec 2011-11-05 20:57:13.910145847 -0400 +@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd - Version: 2.2.17 --Release: 1%{?dist}.1 -+Release: 1%{?dist}.1.scripts.%{scriptsversion} + Version: 2.2.21 +-Release: 1%{?dist} ++Release: 1%{?dist}.scripts.%{scriptsversion} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html -@@ -55,6 +55,14 @@ - Conflicts: pcre < 4.0 - Requires: httpd-tools = %{version}-%{release}, apr-util-ldap +@@ -54,6 +54,15 @@ + Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} + Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units -+Provides: scripts-httpd ++Provides: scripts-httpd = %{version}-%{release} +Patch1000: httpd-suexec-scripts.patch +Patch1003: httpd-2.2.x-mod_status-security.patch @@ -21,25 +21,38 @@ +Patch1006: httpd-suexec-cloexec.patch +Patch1007: httpd-fixup-vhost.patch ++Patch1008: httpd-sysv-deps.patch + %description The Apache HTTP Server is a powerful, efficient, and extensible web server. -@@ -65,6 +73,7 @@ +@@ -64,6 +73,7 @@ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel Requires: apr-devel, apr-util-devel, pkgconfig Requires: httpd = %{version}-%{release} -+Provides: scripts-httpd-devel ++Provides: scripts-httpd-devel = %{version}-%{release} %description devel The httpd-devel package contains the APXS binary and other files -@@ -103,6 +112,7 @@ - Requires(post): openssl >= 0.9.7f-4, /bin/cat +@@ -102,6 +112,7 @@ + Requires(post): openssl, /bin/cat Requires(pre): httpd - Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn} + Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} +Provides: scripts-mod_ssl Obsoletes: stronghold-mod_ssl %description -n mod_ssl -@@ -130,6 +140,13 @@ +@@ -110,6 +121,11 @@ + Security (TLS) protocols. + + %prep ++ ++# Horrible hack to patch the httpd.init file ++cd $RPM_SOURCE_DIR ++%patch1008 -p1 -b .sysv-deps ++ + %setup -q + %patch1 -p1 -b .apctl + %patch2 -p1 -b .apxs +@@ -128,6 +144,13 @@ # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 @@ -55,5 +68,5 @@ vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` if test "x${vmmn}" != "x%{mmn}"; then -@@ -177,10 +194,12 @@ +@@ -175,10 +198,12 @@ --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --enable-suexec --with-suexec \ Index: trunk/server/fedora/specs/krb5.spec.patch =================================================================== --- trunk/server/fedora/specs/krb5.spec.patch (revision 2014) +++ trunk/server/fedora/specs/krb5.spec.patch (revision 2066) @@ -1,16 +1,16 @@ ---- krb5.spec.orig 2011-04-13 14:56:35.000000000 -0400 -+++ krb5.spec 2011-04-27 02:52:07.000000000 -0400 -@@ -10,7 +10,7 @@ +--- krb5.spec.orig 2011-11-16 12:37:32.246736120 -0500 ++++ krb5.spec 2011-11-16 12:42:47.134740975 -0500 +@@ -6,7 +6,7 @@ Summary: The Kerberos network authentication system Name: krb5 - Version: 1.7.1 --Release: 19%{?dist} -+Release: 19%{?dist}.scripts.%{scriptsversion} + Version: 1.9.1 +-Release: 14%{?dist} ++Release: 14%{?dist}.scripts.%{scriptsversion} # Maybe we should explode from the now-available-to-everybody tarball instead? - # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar + # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar Source0: krb5-%{version}.tar.gz -@@ -98,6 +98,8 @@ - Patch109: krb5-1.7.1-paren.patch - Patch110: 2011-004-patch-r18.txt +@@ -65,6 +65,8 @@ + Patch89: krb5-1.9.1-sendto_poll3.patch + Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch +Patch1000: krb5-kuserok-scripts.patch @@ -19,5 +19,5 @@ URL: http://web.mit.edu/kerberos/www/ Group: System Environment/Libraries -@@ -142,6 +144,7 @@ +@@ -114,6 +116,7 @@ %package libs Summary: The shared libraries used by Kerberos 5 @@ -27,8 +27,8 @@ %description libs Kerberos is a network authentication system. The krb5-libs package -@@ -1696,6 +1699,7 @@ - %patch108 -p1 -b .2011-003 - %patch109 -p1 -b .paren - %patch110 -p1 -b .2011-004 +@@ -221,6 +224,7 @@ + %patch88 -p1 -b .crossrealm + %patch89 -p1 -b .sendto_poll3 + %patch90 -p1 -b .2011-006 +%patch1000 -p1 -b .kuserok gzip doc/*.ps Index: trunk/server/fedora/specs/openafs-include-xstat.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs-include-xstat.spec.patch (revision 2014) +++ trunk/server/fedora/specs/openafs-include-xstat.spec.patch (revision 2066) @@ -1,14 +1,14 @@ ---- openafs.spec.orig 2011-10-19 16:05:41.000000000 -0400 -+++ openafs.spec 2011-10-19 16:10:06.000000000 -0400 -@@ -1115,7 +1115,7 @@ +--- openafs.spec.orig 2011-11-04 23:50:34.842221577 -0400 ++++ openafs.spec 2011-11-04 23:52:00.538590290 -0400 +@@ -1103,7 +1103,7 @@ # create list of man pages that go in the 'openafs' package /bin/ls $RPM_BUILD_ROOT%{_mandir}/man1 \ -- |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \ -+ |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \ +- |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \ ++ |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \ + |egrep -v '^afs_compile_et' \ >openafs-man1files - /bin/ls $RPM_BUILD_ROOT%{_mandir}/man5 \ -@@ -1145,6 +1145,8 @@ +@@ -1134,6 +1134,8 @@ %{_bindir}/tokens %{_bindir}/tokens.krb @@ -19,5 +19,5 @@ %{_bindir}/unlog %{_sbindir}/backup -@@ -1196,7 +1198,7 @@ +@@ -1184,7 +1186,7 @@ done @@ -28,5 +28,5 @@ done -@@ -1208,7 +1210,7 @@ +@@ -1196,7 +1198,7 @@ rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump* Index: trunk/server/fedora/specs/openafs-systemd.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs-systemd.spec.patch (revision 2066) +++ trunk/server/fedora/specs/openafs-systemd.spec.patch (revision 2066) @@ -0,0 +1,202 @@ +--- rpmbuild/SPECS/openafs.spec.orig 2011-10-17 23:46:35.000000000 -0400 ++++ rpmbuild/SPECS/openafs.spec 2011-10-17 23:48:41.000000000 -0400 +@@ -224,7 +224,7 @@ + BuildRoot: %{_tmppath}/%{name}-%{version}-root + Packager: OpenAFS Gatekeepers + Group: Networking/Filesystems +-BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison ++BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison, systemd-units + %if 0%{?fedora} + BuildRequires: perl-devel perl-ExtUtils-Embed + %endif +@@ -323,6 +323,12 @@ + %package client + Provides: scripts-openafs-client + Requires: binutils, openafs = %{version} ++%if 0%{?fedora} >= 15 ++Requires: systemd-units ++Requires(post): systemd-units, systemd-sysv ++Requires(preun): systemd-units ++Requires(postun): systemd-units ++%endif + + %if %{fedorakmod} + Requires: %{name}-kmod >= %{version} +@@ -347,6 +353,12 @@ + Requires: openafs = %{version} + Summary: OpenAFS Filesystem Server + Group: Networking/Filesystems ++%if 0%{?fedora} >= 15 ++Requires: systemd-units ++Requires(post): systemd-units, systemd-sysv ++Requires(preun): systemd-units ++Requires(postun): systemd-units ++%endif + + %description server + The AFS distributed filesystem. AFS is a distributed filesystem +@@ -999,7 +1011,12 @@ + mkdir -p $RPM_BUILD_ROOT%{_sbindir} + mkdir -p $RPM_BUILD_ROOT%{_libdir} + mkdir -p $RPM_BUILD_ROOT/etc/sysconfig ++%if 0%{?fedora} < 15 + mkdir -p $RPM_BUILD_ROOT%{initdir} ++%else ++mkdir -p $RPM_BUILD_ROOT%{_unitdir} ++mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules ++%endif + mkdir -p $RPM_BUILD_ROOT/etc/openafs + mkdir -p $RPM_BUILD_ROOT%{pamdir} + mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc +@@ -1029,8 +1046,14 @@ + + # Copy root.client config files + install -m 755 src/packaging/RedHat/openafs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openafs ++%if 0%{?fedora} < 15 + install -m 755 src/packaging/RedHat/openafs-client.init $RPM_BUILD_ROOT%{initdir}/openafs-client + install -m 755 src/packaging/RedHat/openafs-server.init $RPM_BUILD_ROOT%{initdir}/openafs-server ++%else ++install -m 755 src/packaging/RedHat/openafs-client.service $RPM_BUILD_ROOT%{_unitdir}/openafs-client.service ++install -m 755 src/packaging/RedHat/openafs-client.modules $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/openafs-client.modules ++install -m 755 src/packaging/RedHat/openafs-server.service $RPM_BUILD_ROOT%{_unitdir}/openafs-server.service ++%endif + + # Copy PAM modules + install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir} +@@ -1310,7 +1333,14 @@ + fi + + %post client ++%if 0%{?fedora} < 15 + chkconfig --add openafs-client ++%else ++if [ $1 -eq 1 ] ; then ++ # Initial installation ++ /bin/systemctl daemon-reload >/dev/null 2>&1 || : ++fi ++%endif + if [ ! -d /afs ]; then + mkdir /afs + chown root.root /afs +@@ -1327,10 +1357,17 @@ + + %post server + #on an upgrade, don't enable if we were disabled ++%if 0%{?fedora} < 15 + if [ $1 = 1 ] ; then + chkconfig --add openafs-server + fi + %{initdir}/openafs-server condrestart ++%else ++if [ $1 -eq 1 ] ; then ++ # Initial installation ++ /bin/systemctl daemon-reload >/dev/null 2>&1 || : ++fi ++%endif + + %if %{build_authlibs} + %post authlibs +@@ -1346,16 +1383,45 @@ + fi + + %preun client ++%if 0%{?fedora} < 15 + if [ $1 = 0 ] ; then + %{initdir}/openafs-client stop + chkconfig --del openafs-client + fi ++%else ++if [ $1 -eq 0 ] ; then ++ # Package removal, not upgrade ++ /bin/systemctl --no-reload disable openafs-client.service > /dev/null 2>&1 || : ++ /bin/systemctl stop openafs-client.service > /dev/null 2>&1 || : ++fi ++%endif + + %preun server ++%if 0%{?fedora} < 15 + if [ $1 = 0 ] ; then + %{initdir}/openafs-server stop + chkconfig --del openafs-server + fi ++%else ++if [ $1 -eq 0 ] ; then ++ /bin/systemctl --no-reload disable openafs-server.service > /dev/null 2>&1 || : ++ /bin/systemctl stop openafs-server.service > /dev/null 2>&1 || : ++fi ++%endif ++ ++%postun client ++/bin/systemctl daemon-reload >/dev/null 2>&1 || : ++if [ $1 -ge 1 ] ; then ++ # Package upgrade, not uninstall ++ /bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : ++fi ++ ++%postun server ++/bin/systemctl daemon-reload >/dev/null 2>&1 || : ++if [ $1 -ge 1 ] ; then ++ # Package upgrade, not uninstall ++ /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : ++fi + + %if %{build_dkmspkg} + %post -n dkms-%{name} +@@ -1413,6 +1479,32 @@ + %endif + %endif + ++%triggerun -- openafs-client < 1.6.0-1 ++# Save the current service runlevel info ++# User must manually run systemd-sysv-convert --apply httpd ++# to migrate them to systemd targets ++/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||: ++ ++# If the package is allowed to autostart: ++/bin/systemctl --no-reload enable openafs-client.service >/dev/null 2>&1 ||: ++ ++# Run these because the SysV package being removed won't do them ++/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || : ++/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : ++ ++%triggerun -- openafs-server < 1.6.0-1 ++# Save the current service runlevel info ++# User must manually run systemd-sysv-convert --apply httpd ++# to migrate them to systemd targets ++/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||: ++ ++# If the package is allowed to autostart: ++/bin/systemctl --no-reload enable openafs-server.service >/dev/null 2>&1 ||: ++ ++# Run these because the SysV package being removed won't do them ++/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : ++/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : ++ + ############################################################################## + ### + ### file lists +@@ -1450,7 +1542,12 @@ + %{pamdir}/pam_afs.krb.so + %{pamdir}/pam_afs.so.1 + %{pamdir}/pam_afs.so ++%if 0%{?fedora} < 15 + %{initdir}/openafs-client ++%else ++%{_unitdir}/openafs-client.service ++%{_sysconfdir}/sysconfig/modules/openafs-client.modules ++%endif + %{_mandir}/man1/cmdebug.* + %{_mandir}/man1/copyauth.* + %{_mandir}/man1/up.* +@@ -1498,7 +1595,11 @@ + %{_sbindir}/vldb_check + %{_sbindir}/vldb_convert + %{_sbindir}/voldump ++%if 0%{?fedora} < 15 + %{initdir}/openafs-server ++%else ++%{_unitdir}/openafs-server.service ++%endif + %{_mandir}/man5/AuthLog.* + %{_mandir}/man5/BackupLog.* + %{_mandir}/man5/BosConfig.* Index: trunk/server/fedora/specs/openafs.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs.spec.patch (revision 2014) +++ trunk/server/fedora/specs/openafs.spec.patch (revision 2066) @@ -1,25 +1,29 @@ ---- openafs.spec.orig 2010-09-10 18:21:53.000000000 -0400 -+++ openafs.spec 2010-09-10 18:34:30.000000000 -0400 -@@ -8,7 +8,7 @@ - # for beta/rc releases make pkgrel 0.X. +--- rpmbuild/SPECS/openafs.spec ++++ rpmbuild/SPECS/openafs.spec.~3~ 2011-11-20 20:13:52.211673609 -0500 +@@ -4,7 +4,7 @@ + %define pkgvers 1.6.0 + # for beta/rc releases make pkgrel 0. # for real releases make pkgrel 1 (or more for extra releases) - #%define pkgrel 0.1.rc1 --%define pkgrel 0.pre3 -+%define pkgrel 0.pre3.99scripts.%{scriptsversion} +-%define pkgrel 1 ++%define pkgrel 1.99.scripts.%{scriptsversion} - %if %{?osvers:0}%{!?osvers:1} - %define osvers 1 -@@ -261,6 +261,10 @@ - %endif + %{!?fedorakmod: %define fedorakmod 1} + %{!?build_dkmspkg: %define build_dkmspkg 1} +@@ -237,6 +237,14 @@ + ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 +Patch1000: openafs-scripts.patch -+Patch1003: openafs-localcsdb.patch -+Patch1005: openafs-numsysnames.patch ++Patch1001: openafs-localcsdb.patch ++Patch1002: openafs-systemd.patch ++Patch1003: openafs-systemd-crond.patch ++Patch1004: openafs-linux-3.1-rcu.patch ++Patch1005: openafs-linux-3.1-fsync.patch ++Patch1006: openafs-linux-3.1-zalloc.patch + # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 -@@ -343,6 +347,7 @@ +@@ -316,6 +324,7 @@ %if %{build_userspace} @@ -29,5 +33,5 @@ %if %{fedorakmod} -@@ -403,6 +408,7 @@ +@@ -376,6 +385,7 @@ %if %{build_authlibs} @@ -37,5 +41,5 @@ Group: Networking/Filesystems -@@ -419,6 +425,7 @@ +@@ -392,6 +402,7 @@ %endif @@ -43,7 +47,7 @@ +Provides: scripts-openafs-authlibs-devel %if %{build_authlibs} - Requires: openafs-authlibs = %{version} + Requires: openafs-authlibs = %{version}-%{release} %endif -@@ -437,6 +444,7 @@ +@@ -410,6 +421,7 @@ libraries. @@ -52,6 +56,6 @@ Summary: OpenAFS Development Libraries and Headers Group: Development/Filesystems - -@@ -465,6 +473,7 @@ + Requires: openafs = %{version}-%{release} +@@ -439,6 +451,7 @@ administrators. @@ -61,5 +65,5 @@ Group: Networking/Filesystems Provides: openafs-kernel = %{version} -@@ -514,6 +523,7 @@ +@@ -488,6 +501,7 @@ %if %{krb5support} @@ -69,5 +73,5 @@ Requires: openafs = %{version} Group: Networking/Filesystems -@@ -540,7 +550,7 @@ +@@ -514,7 +528,7 @@ %if %{build_modules} @@ -78,12 +82,32 @@ %else -@@ -699,6 +709,9 @@ +@@ -671,6 +685,15 @@ + #%setup -q -n %{srcdir} + %setup -q -b 1 -n %{srcdir} - # Patch openafs to build a kernel module named "openafs" instead of "libafs" - %patch0 -p1 -b .kmod26 ++# Apply the Scripts patch +%patch1000 -p1 -b .scripts -+%patch1003 -p1 -b .localcsdb -+%patch1005 -p1 -b .numsysnames - ++%patch1001 -p1 -b .localcsdb ++%patch1002 -p1 -b .systemd ++%patch1003 -p1 -b .systemd-crond ++%patch1004 -p1 -b .rcu ++%patch1005 -p1 -b .fsync ++%patch1006 -p1 -b .zalloc ++ ############################################################################## # + # building +@@ -1212,6 +1235,13 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so + rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* + rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* ++%else ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* + %endif + + %endif Index: trunk/server/fedora/specs/openssh.spec.patch =================================================================== --- trunk/server/fedora/specs/openssh.spec.patch (revision 2014) +++ trunk/server/fedora/specs/openssh.spec.patch (revision 2066) @@ -1,38 +1,37 @@ --- 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 --Release: %{openssh_rel}%{?dist}%{?rescue_rel} -+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion} + Version: %{openssh_ver} +-Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1 ++Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1.scripts.%{scriptsversion} URL: http://www.openssh.com/portable.html #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 + Index: trunk/server/fedora/specs/python-routefs.spec =================================================================== --- trunk/server/fedora/specs/python-routefs.spec (revision 2014) +++ (revision ) @@ -1,55 +1,0 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: python-routefs -Version: 0.0.1 -Release: 1%{?dist} -Summary: A FUSE API wrapper based on URL routing - -Group: Development/Languages -License: MIT -URL: http://ebroder.net/code/python-routefs.git -Source0: python-routefs.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: python-devel -BuildRequires: python-routes >= 1.7 -BuildRequires: fuse-python >= 0.2 -Requires: python-routes >= 1.7 -Requires: fuse-python >= 0.2 - -%description - -RouteFS is a base class for developing read-only FUSE filesystems that -lets you focus on the directory tree instead of the system calls. - -RouteFS uses the Routes library developed for Pylons. URLs were -inspired by filesystems, and now you can have filesystems inspired by -URLs. - - -%prep -%setup -q -n %{name} - - -%build -%{__python} setup.py build - - -%install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc -%{python_sitelib}/* - - -%changelog -* Sun Sep 14 2008 Anders Kaseorg - 0.0.1 -- Initial RPM release. Index: trunk/server/fedora/specs/redland-bindings.spec.patch =================================================================== --- trunk/server/fedora/specs/redland-bindings.spec.patch (revision 2014) +++ trunk/server/fedora/specs/redland-bindings.spec.patch (revision 2066) @@ -1,9 +1,9 @@ ---- redland-bindings.spec 2011-10-12 14:51:58.000000000 -0400 -+++ redland-bindings-php.spec 2011-10-13 10:15:24.000000000 -0400 +--- redland-bindings.spec.old 2011-10-12 14:51:58.000000000 -0400 ++++ redland-bindings.spec 2011-10-13 10:15:24.000000000 -0400 @@ -1,6 +1,6 @@ Name: redland-bindings - Version: 1.0.7.1 --Release: 1%{?dist} -+Release: 1%{?dist}.scripts.%{scriptsversion} + Version: 1.0.11.1 +-Release: 6%{?dist} ++Release: 6%{?dist}.scripts.%{scriptsversion} Summary: Redland RDF Application Framework API Bindings Index: trunk/server/fedora/specs/rubygems.spec.patch =================================================================== --- trunk/server/fedora/specs/rubygems.spec.patch (revision 2066) +++ trunk/server/fedora/specs/rubygems.spec.patch (revision 2066) @@ -0,0 +1,30 @@ +--- rubygems.spec.orig 2011-11-04 14:16:37.000000000 -0400 ++++ rubygems.spec 2011-11-04 14:32:02.000000000 -0400 +@@ -15,7 +15,7 @@ + Summary: The Ruby standard for packaging ruby libraries + Name: rubygems + Version: 1.7.2 +-Release: 3%{?dist} ++Release: 3%{?dist}.scripts.%{scriptsversion} + Group: Development/Libraries + # No GPL version is specified. + License: Ruby or GPL+ +@@ -40,6 +40,9 @@ + # ... and spec_file is not supported yet + Patch7: rubygems-1.7.2-escape-string-skip-test.patch + ++Provides: scripts-rubygems = %{version}-%{release} ++Patch1000: rubygems-rails-require-thread.patch ++ + Requires: ruby(abi) = 1.8 + Requires: ruby >= 1.8.7 + Requires: ruby-rdoc +@@ -69,6 +72,8 @@ + %patch6 -p1 -b .esc + %patch7 -p1 -b .esc.skip + ++%patch1000 -p1 -b .thread ++ + # Some of the library files start with #! which rpmlint doesn't like + # and doesn't make much sense + for f in `find lib -name \*.rb` ; do Index: trunk/server/fedora/specs/scripts-base.spec =================================================================== --- trunk/server/fedora/specs/scripts-base.spec (revision 2014) +++ trunk/server/fedora/specs/scripts-base.spec (revision 2066) @@ -21,4 +21,6 @@ Requires: scripts-openafs-krb5 Requires: scripts-openssh-server +Requires: scripts-static-cat +Requires: scripts-rubygems Requires: sql-signup Requires: tokensys Index: trunk/server/fedora/specs/scripts-python-path.spec =================================================================== --- trunk/server/fedora/specs/scripts-python-path.spec (revision 2014) +++ (revision ) @@ -1,37 +1,0 @@ -Summary: scripts.mit.edu python path configuration -Group: Development/Languages -Name: scripts-python-path -Version: 0.%{scriptsversion} -Release: 0 -Vendor: The scripts.mit.edu Team (scripts@mit.edu) -URL: http://scripts.mit.edu -License: GPL -Source: %{name}.tar.gz -BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root - -%description - -scripts.mit.edu python path configuration -See http://scripts.mit.edu/wiki for more information. - -%prep -%setup -q -n %{name} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%install -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{python_sitelib} -install -m 644 00scripts-home.pth $RPM_BUILD_ROOT%{python_sitelib} - -%clean -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT - -%files -%defattr(0644, root, root) -%{python_sitelib}/00scripts-home.pth - -%changelog -* Thu Jul 9 2009 Geoffrey Thomas -- Update to Python 2.6 -* Tue Jan 27 2009 Quentin Smith -- initial release Index: trunk/server/fedora/specs/scripts-static-cat.spec =================================================================== --- trunk/server/fedora/specs/scripts-static-cat.spec (revision 2014) +++ trunk/server/fedora/specs/scripts-static-cat.spec (revision 2066) @@ -1,8 +1,5 @@ -# link with shared libs -# andersk: Disabled for 3x faster startup speed. -#%%bcond_without dynamic - -# ghc does not emit debug information -%global debug_package %{nil} +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell Name: scripts-static-cat @@ -15,8 +12,8 @@ URL: http://scripts.mit.edu/ Source0: %{name}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +BuildRequires: ghc-devel +# macros for building haskell packages BuildRequires: ghc-rpm-macros >= 0.7.0 BuildRequires: ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel @@ -35,10 +32,5 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_bin_install - - -%clean -rm -rf $RPM_BUILD_ROOT @@ -49,4 +41,7 @@ %changelog +* Mon May 2 2011 Alexander Chernyakhovsky - 0.0-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 0.0-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/tokensys.spec =================================================================== --- trunk/server/fedora/specs/tokensys.spec (revision 2014) +++ trunk/server/fedora/specs/tokensys.spec (revision 2066) @@ -10,5 +10,9 @@ BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root %define debug_package %{nil} -Prereq: /usr/kerberos/bin/kinit, /usr/bin/aklog +Prereq: /usr/bin/kinit, /usr/bin/aklog +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +BuildRequires: systemd-units %description @@ -17,5 +21,6 @@ Contains: - A shell script for renewing the scripts AFS credentials - - A crontab for calling the renew script + - A shell script for configuring scripts AFS + - systemd units for running the above See http://scripts.mit.edu/wiki for more information. @@ -24,10 +29,13 @@ %build -./configure --with-kinit=/usr/kerberos/bin/kinit --with-aklog=/usr/bin/aklog +./configure --with-kinit=/usr/bin/kinit --with-aklog=/usr/bin/aklog --with-fs=/usr/bin/fs %install [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT install -D renew $RPM_BUILD_ROOT/home/afsagent/renew -install -D crontab $RPM_BUILD_ROOT/etc/cron.d/afsagent +install -D scripts-afsagent-startup $RPM_BUILD_ROOT/usr/local/libexec/scripts-afsagent-startup +install -D scripts-afsagent-startup.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent-startup.service +install -D scripts-afsagent.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.service +install -D scripts-afsagent.timer $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.timer %clean @@ -35,8 +43,10 @@ %files -%defattr(0600, root, root) -/etc/cron.d/afsagent +%defattr(0644,root,root) +%{_unitdir}/*.service +%{_unitdir}/*.timer %defattr(0755, afsagent, afsagent) /home/afsagent/renew +/usr/local/libexec/scripts-afsagent-startup %pre @@ -44,5 +54,32 @@ useradd -u 101 -g 101 afsagent || [ $? -eq 9 ] +%post +/bin/systemctl enable scripts-afsagent-startup.service >/dev/null 2>&1 || : +/bin/systemctl enable scripts-afsagent.service >/dev/null 2>&1 || : +/bin/systemctl enable scripts-afsagent.timer >/dev/null 2>&1 || : + +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable scripts-afsagent-startup.service > /dev/null 2>&1 || : + /bin/systemctl --no-reload disable scripts-afsagent.service > /dev/null 2>&1 || : + /bin/systemctl --no-reload disable scripts-afsagent.timer > /dev/null 2>&1 || : + /bin/systemctl stop scripts-afsagent-startup.service > /dev/null 2>&1 || : + /bin/systemctl stop scripts-afsagent.service > /dev/null 2>&1 || : + /bin/systemctl stop scripts-afsagent.timer > /dev/null 2>&1 || : +fi + %postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart scripts-afsagent.service >/dev/null 2>&1 || : +fi + if [ "$1" = "0" ] ; then userdel -r afsagent @@ -50,4 +87,8 @@ %changelog +* Mon Nov 21 2011 Quentin Smith +- add systemd units +- remove crontab + * Tue Aug 17 2010 Geoffrey Thomas - aklog csail as well Index: trunk/server/fedora/specs/whoisd.spec =================================================================== --- trunk/server/fedora/specs/whoisd.spec (revision 2014) +++ trunk/server/fedora/specs/whoisd.spec (revision 2066) @@ -1,16 +1,21 @@ -Summary: whoisd for (virtualhost aware) -Group: Applications/System -Name: whoisd -Version: 0.%{scriptsversion} -Release: 0 -Vendor: The scripts.mit.edu Team (scripts@mit.edu) -URL: http://scripts.mit.edu -License: GPL -Source0: %{name}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: whoisd for (virtualhost aware) +Group: Applications/System +Name: whoisd +Version: 0.%{scriptsversion} +Release: 1 +Vendor: The scripts.mit.edu Team (scripts@mit.edu) +URL: http://scripts.mit.edu +License: GPL +Source0: %{name}.tar.gz + %define debug_package %{nil} -#BuildRequires: make -Requires: python-twisted-core +Requires: python-twisted-core +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(post): systemd-sysv %description @@ -24,17 +29,33 @@ %install -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT exec_prefix=/usr/local -%clean -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT +%post +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl enable scripts-whoisd.service >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ]; then + /bin/systemctl --no-reload disable scripts-whoisd.service >/dev/null 2>&1 || : + /bin/systemctl stop scripts-whoisd.service > /dev/null 2>&1 || : +fi + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ]; then + /bin/systemctl try-restart scripts-whoisd.service >/dev/null 2>&1 || : +fi %files %defattr(0644,root,root,-) /usr/local/libexec/whoisd.tac -%defattr(0600,root,root) -/etc/cron.d/whoisd +%defattr(0644,root,root) +/lib/systemd/system/scripts-whoisd.service %changelog +* Thu Aug 25 2011 Alexander Chernyakhovsky 0-1 +- package systemd service file * Tue Jun 03 2008 Joe Presbrey 0.00 Index: trunk/server/fedora/specs/zephyr.spec =================================================================== --- trunk/server/fedora/specs/zephyr.spec (revision 2014) +++ trunk/server/fedora/specs/zephyr.spec (revision 2066) @@ -1,4 +1,4 @@ Name: zephyr -Version: 3.0 +Version: 3.0.1 Release: 0.%{scriptsversion}%{?dist} Summary: Client programs for the Zephyr real-time messaging system @@ -71,5 +71,4 @@ make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT @@ -80,5 +79,12 @@ install -m755 zhm.init \ $RPM_BUILD_ROOT%{_initddir}/zhm - +# Make RPM's Provide: searcher actually search the .so files! A recent +# change in how RPM detects Provides automatically means that only +# files that are executable get searched. Without this hack, all of +# the zephyr client tools are Requires: libzephyr.so.4 which is never +# Provides:, leading to uninstallable RPMS. This can be removed when +# zephyr starts installing the libraries with mode 755 rather than +# 644. (Zephyr #79) +chmod a+x $RPM_BUILD_ROOT%{_libdir}/libzephyr.so.* %post @@ -139,4 +145,7 @@ %changelog +* Sat Apr 16 2011 Alexander Chernyakhovsky 3.0.1-0 +- Zephyr 3.0.1 + * Sun Sep 19 2010 Anders Kaseorg - 3.0-0 - Decrease version below a hypothetical Fedora package.