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:   31-Jul-2007 10:08:54
  Branch: HEAD                             Handle: 2007073109085300

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

  Log:
    add XFCE icon theme, too

  Summary:
    Revision    Changes     Path
    1.3         +31 -2      openpkg-src/icon-theme/icon-theme.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/icon-theme/icon-theme.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 icon-theme.spec
  --- openpkg-src/icon-theme/icon-theme.spec    30 Jul 2007 21:53:36 -0000      
1.2
  +++ openpkg-src/icon-theme/icon-theme.spec    31 Jul 2007 08:08:53 -0000      
1.3
  @@ -28,6 +28,7 @@
   %define       V_gnome_icon_theme_major 2.19
   %define       V_gnome_icon_theme_minor 1
   %define       V_tango_icon_theme       0.8.0
  +%define       V_xfce_icon_theme        4.4.1
   
   #   package information
   Name:         icon-theme
  @@ -40,13 +41,14 @@
   Group:        X11
   License:      GPL
   Version:      0
  -Release:      20070730
  +Release:      20070731
   
   #   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://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
  +Source4:      
http://www.ca-us.xfce.org/archive/xfce-%{V_xfce_icon_theme}/src/xfce4-icon-theme-%{V_xfce_icon_theme}.tar.bz2
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -59,7 +61,8 @@
   %description
       This is a bundle of icons themes following the FreeDesktop Icon
       Theme standard. Currently it provides the Hicolor Fallback icon
  -    theme, the Tango icon theme and the GNOME icon theme.
  +    theme ("hicolor"), the Tango icon theme ("Tango"), the GNOME icon
  +    theme ("gnome") and the XFCE icon theme ("Rodent").
   
   %track
       prog icon-theme:hicolor-icon-theme = {
  @@ -82,12 +85,20 @@
           url       = 
http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/%{V_gnome_icon_theme_major}/
           regex     = gnome-icon-theme-(__VER__).tar.gz
       }
  +    prog icon-theme:xfce-icon-theme = {
  +        version   = %{V_xfce_icon_theme}
  +        url       = http://www.ca-us.xfce.org/archive/
  +        regex     = xfce-(\d+\.\d+(?:\.\d+)*)
  +        url       = http://www.ca-us.xfce.org/archive/xfce-__NEWVER__/src/
  +        regex     = xfce4-icon-theme-(__VER__).tar.bz2
  +    }
   
   %prep
       %setup -q -c
       %setup -q -T -D -a 1
       %setup -q -T -D -a 2
       %setup -q -T -D -a 3
  +    %setup -q -T -D -a 4
   
   %build
   
  @@ -122,6 +133,7 @@
         %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
         mv  $RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/pkgconfig/* \
             $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
  +      rmdir $RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/pkgconfig 2>&1 || 
true
       ) || exit $?
   
       #   install Tango icon theme
  @@ -156,6 +168,23 @@
             
ICONMAP="$RPM_BUILD_ROOT%{l_prefix}/libexec/icon-theme/icon-name-mapping"
         mv  $RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/pkgconfig/* \
             $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
  +      rmdir $RPM_BUILD_ROOT%{l_prefix}/share/icon-theme/pkgconfig 2>&1 || 
true
  +    ) || exit $?
  +
  +    #   install XFCE icon theme
  +    ( cd xfce4-icon-theme-%{V_xfce_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 $?
   
       #   strip down installation
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to