Ignore:
Timestamp:
May 2, 2011, 5:54:10 PM (14 years ago)
Author:
achernya
Message:
Revert all cabal2spec generated files

In order to make the history look better with respect to the 3-way
merge, revert all of the current changes to all cabal2spec generated
files, bringing them back to their original F11 state.
Location:
branches/fc15-dev/server/fedora/specs
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r1833 r1839  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    4 
    51%global pkg_name MonadCatchIO-mtl
    62
    7 # common part of summary for all the subpackages
    83%global common_summary Haskell %{pkg_name} library
    94
    10 # main description used for all the subpackages
    115%global common_description A %{pkg_name} library for Haskell.
    126
    13 # add any Haskell library dependencies here: 
     7# add any Haskell library dependencies here:
    148%global ghc_pkg_deps ghc-mtl-devel
    159
    16 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
    17 #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
    18 
    19 # foreign library dependencies (used for buildrequires and devel subpkg requires)
     10# add any foreign library dependencies here:
    2011#%%global ghc_pkg_c_deps @CDEP1@-devel
    2112
    … …  
    2617
    2718Name:           ghc-%{pkg_name}
    28 Version:        0.3.0.2
    29 Release:        1.%{scriptsversion}%{?dist}
     19Version:        0.3.0.1
     20Release:        0.%{scriptsversion}%{?dist}
    3021Summary:        %{common_summary}
    3122
    3223Group:          System Environment/Libraries
    3324License:        BSD
    34 URL:            http://hackage.haskell.org/package/%{pkg_name}
     25URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
    3526Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
     27BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    3628# fedora ghc archs:
    37 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
     29ExclusiveArch:  %{ix86} x86_64 ppc alpha
    3830BuildRequires:  ghc, ghc-doc, ghc-prof
    39 # macros for building haskell packages
    40 BuildRequires:  ghc-rpm-macros >= 0.7.3
    41 BuildRequires:  hscolour
     31BuildRequires:  ghc-rpm-macros >= 0.7.0
    4232%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    4333%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
    … …  
    4535%description
    4636%{common_description}
     37%if %{with shared}
     38This package provides the shared library.
     39%endif
     40
     41
     42%{?ghc_lib_package}
    4743
    4844
    … …  
    5652
    5753%install
     54rm -rf $RPM_BUILD_ROOT
    5855%ghc_lib_install
    5956
    6057
    61 # define the devel and prof subpkgs, devel post[un] scripts, and filelists:
    62 # ghc-%pkg_name{,devel,prof}.files
    63 %ghc_lib_package
     58%clean
     59rm -rf $RPM_BUILD_ROOT
    6460
    6561
    6662%changelog
    67 * Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.0.2-1
    68 - regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5
    69 
    7063* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
    7164- initial packaging for Fedora automatically generated by cabal2spec-0.22.1

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

    r1834 r1839  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    4 
    51%global pkg_name cgi
    62
    7 # common part of summary for all the subpackages
    83%global common_summary Haskell %{pkg_name} library
    94
    10 # main description used for all the subpackages
    115%global common_description A %{pkg_name} library for Haskell.
    126
    13 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
     7# add any Haskell library dependencies here:
    148%global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel
    159
    16 # foreign library dependencies (used for buildrequires and devel subpkg requires)
     10# add any foreign library dependencies here:
    1711#%%global ghc_pkg_c_deps @CDEP1@-devel
    1812
     13%bcond_without shared
     14
     15# debuginfo is not useful for ghc
     16%global debug_package %{nil}
     17
    1918Name:           ghc-%{pkg_name}
    20 Version:        3001.1.8.2
     19Version:        3001.1.8.1
    2120Release:        0.%{scriptsversion}%{?dist}
    2221Summary:        %{common_summary}
    … …  
    2423Group:          System Environment/Libraries
    2524License:        BSD
    26 URL:            http://hackage.haskell.org/package/%{pkg_name}
     25URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
    2726Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
     27BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2828# fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
     29ExclusiveArch:  %{ix86} x86_64 ppc alpha
    3030BuildRequires:  ghc, ghc-doc, ghc-prof
    31 # macros for building haskell packages
    32 BuildRequires:  ghc-rpm-macros >= 0.7.3
    33 BuildRequires:  hscolour
     31BuildRequires:  ghc-rpm-macros >= 0.7.0
    3432%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    3533%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
    … …  
    3735%description
    3836%{common_description}
     37%if %{with shared}
     38This package provides the shared library.
     39%endif
     40
     41
     42%{?ghc_lib_package}
    3943
    4044
    … …  
    4852
    4953%install
     54rm -rf $RPM_BUILD_ROOT
    5055%ghc_lib_install
    5156
    5257
    53 # define the devel and prof subpkgs, devel post[un] scripts, and filelists:
    54 # ghc-%pkg_name{,devel,prof}.files
    55 %ghc_lib_package
     58%clean
     59rm -rf $RPM_BUILD_ROOT
    5660
    5761
    5862%changelog
    59 * Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.2-0
    60 - regenerated with cabal2spec-0.22.5
    61 
    6263* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0
    6364- initial packaging for Fedora automatically generated by cabal2spec-0.22.1

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

    r1833 r1839  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    4 
    51%global pkg_name unix-handle
    62
    7 # common part of summary for all the subpackages
    83%global common_summary Haskell %{pkg_name} library
    94
    10 # main description used for all the subpackages
    115%global common_description A %{pkg_name} library for Haskell.
    126
    13 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
     7# add any Haskell library dependencies here:
    148#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
    159
    16 # foreign library dependencies (used for buildrequires and devel subpkg requires)
     10# add any foreign library dependencies here:
    1711#%%global ghc_pkg_c_deps @CDEP1@-devel
     12
     13%bcond_without shared
     14
     15# debuginfo is not useful for ghc
     16%global debug_package %{nil}
    1817
    1918Name:           ghc-%{pkg_name}
    … …  
    2423Group:          System Environment/Libraries
    2524License:        BSD
    26 URL:            http://hackage.haskell.org/package/%{pkg_name}
     25URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
    2726Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
     27BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2828# fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
     29ExclusiveArch:  %{ix86} x86_64 ppc alpha
    3030BuildRequires:  ghc, ghc-doc, ghc-prof
    31 # macros for building haskell packages
    32 BuildRequires:  ghc-rpm-macros >= 0.7.3
    33 BuildRequires:  hscolour
     31BuildRequires:  ghc-rpm-macros >= 0.7.0
    3432%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    3533%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
    … …  
    3735%description
    3836%{common_description}
     37%if %{with shared}
     38This package provides the shared library.
     39%endif
     40
     41
     42%{?ghc_lib_package}
    3943
    4044
    … …  
    4852
    4953%install
     54rm -rf $RPM_BUILD_ROOT
    5055%ghc_lib_install
    5156
    5257
    53 # define the devel and prof subpkgs, devel post[un] scripts, and filelists:
    54 # ghc-%pkg_name{,devel,prof}.files
    55 %ghc_lib_package
     58%clean
     59rm -rf $RPM_BUILD_ROOT
    5660
    5761
    5862%changelog
    59 * Sat Apr 30 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
    60 - regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5
    61 
    6263* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
    6364- initial packaging for Fedora automatically generated by cabal2spec-0.22.1

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

    r1831 r1839  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     1# link with shared libs
     2# andersk: Disabled for 3x faster startup speed.
     3#%%bcond_without dynamic
     4
     5# ghc does not emit debug information
     6%global debug_package %{nil}
    47
    58Name:           scripts-static-cat
    … …  
    1013Group:          Applications/System
    1114License:        GPL
    12 URL:            http://scripts.mit.edu
     15URL:            http://scripts.mit.edu/
    1316Source0:        %{name}.tar.gz
    1417BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    1518# fedora ghc archs:
    16 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    17 BuildRequires:  ghc-devel
    18 # macros for building haskell packages
     19ExclusiveArch:  %{ix86} x86_64 ppc alpha
     20BuildRequires:  ghc
    1921BuildRequires:  ghc-rpm-macros >= 0.7.0
    2022BuildRequires:  ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
    … …  
    3335
    3436%install
     37rm -rf $RPM_BUILD_ROOT
    3538%ghc_bin_install
     39
     40
     41%clean
     42rm -rf $RPM_BUILD_ROOT
    3643
    3744
    … …  
    4249
    4350%changelog
    44 * Sat Apr 30 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0
    45 - regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5
    46 
    4751* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0-0
    4852- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
Note: See TracChangeset for help on using the changeset viewer.