OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   30-Jul-2007 23:53:36
  Branch: HEAD                             Handle: 2007073022533600

  Modified files:
    openpkg-src/icon-theme  icon-theme.spec

  Log:
    add Tango icon theme, too

  Summary:
    Revision    Changes     Path
    1.2         +38 -3      openpkg-src/icon-theme/icon-theme.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/icon-theme/icon-theme.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 icon-theme.spec
  --- openpkg-src/icon-theme/icon-theme.spec    30 Jul 2007 21:43:19 -0000      
1.1
  +++ openpkg-src/icon-theme/icon-theme.spec    30 Jul 2007 21:53:36 -0000      
1.2
  @@ -27,6 +27,7 @@
   %define       V_icon_naming_utils      0.8.2
   %define       V_gnome_icon_theme_major 2.19
   %define       V_gnome_icon_theme_minor 1
  +%define       V_tango_icon_theme       0.8.0
   
   #   package information
   Name:         icon-theme
  @@ -44,7 +45,8 @@
   #   list of sources
   Source0:      
http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-%{V_hicolor_icon_theme}.tar.gz
   Source1:      
http://tango.freedesktop.org/releases/icon-naming-utils-%{V_icon_naming_utils}.tar.gz
  -Source2:      
http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/%{V_gnome_icon_theme_major}/gnome-icon-theme-%{V_gnome_icon_theme_major}.%{V_gnome_icon_theme_minor}.tar.gz
  +Source2:      
http://tango.freedesktop.org/releases/tango-icon-theme-%{V_tango_icon_theme}.tar.gz
  +Source3:      
http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/%{V_gnome_icon_theme_major}/gnome-icon-theme-%{V_gnome_icon_theme_major}.%{V_gnome_icon_theme_minor}.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -56,8 +58,8 @@
   
   %description
       This is a bundle of icons themes following the FreeDesktop Icon
  -    Theme standard. Currently it provides the Icon Theme framework plus
  -    the GNOME Icon Theme.
  +    Theme standard. Currently it provides the Hicolor Fallback icon
  +    theme, the Tango icon theme and the GNOME icon theme.
   
   %track
       prog icon-theme:hicolor-icon-theme = {
  @@ -70,6 +72,11 @@
           url       = http://tango.freedesktop.org/releases/
           regex     = icon-naming-utils-(__VER__)\.tar\.gz
       }
  +    prog icon-theme:tango-icon-theme = {
  +        version   = %{V_tango_icon_theme}
  +        url       = http://tango.freedesktop.org/releases/
  +        regex     = tango-icon-theme-(__VER__).tar.gz
  +    }
       prog icon-theme:gnome-icon-theme = {
           version   = %{V_gnome_icon_theme_major}.%{V_gnome_icon_theme_minor}
           url       = 
http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/%{V_gnome_icon_theme_major}/
  @@ -80,13 +87,17 @@
       %setup -q -c
       %setup -q -T -D -a 1
       %setup -q -T -D -a 2
  +    %setup -q -T -D -a 3
   
   %build
   
   %install
  +    #   create common directories
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
  +
  +    #   install filesystem layout
       ( cd hicolor-icon-theme-%{V_hicolor_icon_theme}
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O}" \
  @@ -97,6 +108,8 @@
             --datadir=%{l_prefix}/share/icon-theme
         %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
       ) || exit $?
  +
  +    #   install icon naming utilities
       ( cd icon-naming-utils-%{V_icon_naming_utils}
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O}" \
  @@ -110,6 +123,24 @@
         mv  $RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/pkgconfig/* \
             $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
       ) || exit $?
  +
  +    #   install Tango icon theme
  +    ( cd tango-icon-theme-%{V_tango_icon_theme}
  +      CC="%{l_cc}" \
  +      CFLAGS="%{l_cflags -O}" \
  +      CPPFLAGS="%{l_cppflags}" \
  +      LDFLAGS="%{l_ldflags}" \
  +      
PKG_CONFIG_PATH="$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig:%{l_prefix}/lib/pkgconfig"
 \
  +      ./configure \
  +          --prefix=%{l_prefix} \
  +          --datadir=%{l_prefix}/share/icon-theme
  +      export 
INU_DATA_DIR="$RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/icon-naming-utils"
  +      %{l_make} %{l_mflags} install \
  +          AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
  +          
ICONMAP="$RPM_BUILD_ROOT%{l_prefix}/libexec/icon-theme/icon-name-mapping"
  +    ) || exit $?
  +
  +    #   install GNOME icon theme
       ( cd 
gnome-icon-theme-%{V_gnome_icon_theme_major}.%{V_gnome_icon_theme_minor}
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O}" \
  @@ -126,7 +157,11 @@
         mv  $RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/pkgconfig/* \
             $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
       ) || exit $?
  +
  +    #   strip down installation
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale 2>&1 || true
  +
  +    #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to