Browse Source

update: Xfce4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3253 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
df2106aaef

+ 54 - 47
T/Thunar/Thunar-vl.spec

@@ -1,27 +1,31 @@
+Name: 		Thunar
 Summary: 	modern file manager
 Summary(ja): 	近代的なファイルマネージャ
-Name: 		Thunar
-Version: 	1.0.2
+Version: 	1.2.0
 Release: 	1%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPLv2 and LGPLv2
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:  libexo-devel >= 0.3.100
-BuildRequires:  glib2-devel >= 2.12.0
-BuildRequires: 	gtk2-devel >= 2.10.0
-BuildRequires:  libxfce4util-devel >= 4.6.0
-BuildRequires:  libpng-devel >= 1.2.0
 BuildRequires:  dbus-glib-devel >= 0.34
-BuildRequires:  GConf2-devel >= 2.4.0
-BuildRequires:  startup-notification-devel >= 0.4
-BuildRequires:  freetype2-devel
-BuildRequires:  gamin-devel >= 0.1.0
-BuildRequires:  hal-devel >= 0.5.0
+BuildRequires:  glib2-devel >= 2.18.0
+BuildRequires: 	gtk2-devel >= 2.14.0
 BuildRequires:  libexif-devel >= 0.6.0
+BuildRequires:  libexo-devel >= 0.6.0
+BuildRequires:  libgudev1-devel >= 145
+BuildRequires:  libnotify-devel >= 0.4.0
+BuildRequires:  libSM-devel 
+BuildRequires:  libxfce4ui-devel >= 4.8.0
+BuildRequires:  libxfce4util-devel >= 4.8.0
 BuildRequires:  pcre-devel >= 6.0
-BuildRequires:  xfce4-panel-devel >= 4.3.90
+BuildRequires:  pkgconfig
+BuildRequires:  startup-notification-devel >= 0.4
+BuildRequires:  xfce4-panel-devel >= 4.7.0
+BuildRequires:  xfconf
 
 Obsoletes:      xffm
 
@@ -33,9 +37,8 @@ easy-to-use and fast.
 Summary: Development headers for Thunar
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libexo-devel >= 0.3.100
-Requires: gtk2-devel >= 2.10.0
-Requires: pkgconfig
+Requires: glib2-devel >= 2.18.0
+Requires: gtk2-devel >= 2.14.0
 
 %description devel
 This package includes the header files you will need to build
@@ -45,72 +48,76 @@ plugins for Thunar.
 %setup -q
 
 %build
-%configure
+%configure --enable-silent-rules
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+
+## remove unuse files
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/thunarx-2/*.la
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/*.la
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/icon-theme.cache
 
-rm -rf docs_to_include
-mkdir -p docs_to_include
-mv $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/* docs_to_include
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* _docs_to_include
 #cp AUTHORS COPYING COPYING.LIB ChangeLog FAQ HACKING NEWS README THANKS TODO $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}
 
 %find_lang %{name}
 
-## remove unuse files
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/thunarx-1/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%post
 /sbin/ldconfig
-
-%postun 
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
 /sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS
-%doc docs_to_include/*
+%doc _docs_to_include/*
 %{_sysconfdir}/xdg/Thunar
 %{_bindir}/*
 %{_libdir}/lib*.so.*
-%dir %{_libdir}/thunarx-1
-%{_libdir}/thunarx-1/*.so
-%{_libexecdir}/*
+%dir %{_libdir}/Thunar
+%{_libdir}/Thunar/*
+%dir %{_libdir}/thunarx-2
+%{_libdir}/thunarx-2/*.so
+%{_libdir}/xfce4/panel/plugins/lib*.so
 %{_datadir}/Thunar
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/*.service
-%{_datadir}/icons/hicolor/icon-theme.cache
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/stock/navigation/*
+%{_datadir}/icons/hicolor/*
 %{_datadir}/pixmaps/Thunar
-%{_datadir}/thumbnailers
+#{_datadir}/thumbnailers
 %{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
 %{_mandir}/man1/Thunar*
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/thunar-vfs-1
-%{_includedir}/thunarx-1
+%{_includedir}/thunarx-2
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/gtk-doc/html/thunar-vfs
+#%{_datadir}/gtk-doc/html/thunar-vfs
 %{_datadir}/gtk-doc/html/thunarx
 
 %changelog
+* Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.0-1
+- new upstream release
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.2-1
 - new upstream release
 - built with new toolchain

+ 125 - 0
g/garcon/garcon-vl.spec

@@ -0,0 +1,125 @@
+%global minorversion 0.1
+
+Name:           garcon
+Summary:        Implementation of the freedesktop.org menu specification
+Version:        0.1.5
+Release:        4%{?_dist_release}
+
+Group:          System Environment/Libraries
+# garcon's source code is licensed under the LGPLv2+,
+# while its documentation is licensed under the GFDL 1.1
+License:        LGPLv2+ and GFDL
+URL:            http://xfce.org/
+
+Source0:        http://archive.xfce.org/src/libs/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+Patch0:         garcon-0.1.5-redhat-menus.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:  glib2-devel >= 2.14
+BuildRequires:  gtk2-devel >= 2.12.0
+BuildRequires:  gtk-doc
+BuildRequires:  gettext
+BuildRequires:  intltool
+#Requires:       redhat-menus
+
+Provides:       libxfce4menu = 4.6.2-3 
+Obsoletes:      libxfce4menu < 4.6.2-3
+# because of %%{_datadir}/desktop-directories/xfce-*
+Conflicts:      xfdesktop <= 4.6.2
+
+%description
+Garcon is an implementation of the freedesktop.org menu specification replacing
+the former Xfce menu library libxfce4menu. It is based on GLib/GIO only and 
+aims at covering the entire specification except for legacy menus.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel
+Requires:       pkgconfig
+# FIXME not yet in place
+Provides:       libxfce4menu-devel = 4.6.2-3 
+Obsoletes:      libxfce4menu-devel < 4.6.2-3
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+#patch0 -p1 -b.redhat-menus
+
+%build
+%configure --disable-static --enable-gtk-doc
+make %{?_smp_mflags} V=1
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
+%{_libdir}/*.so.*
+%{_datadir}/desktop-directories/xfce-*.directory
+
+%files devel
+%defattr(-,root,root,-)
+%doc HACKING STATUS TODO
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%doc %{_datadir}/gtk-doc/
+
+%changelog
+* Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.5-4
+- Initial build for Vine Linux
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 17 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.5-2
+- Include rebased redhat-menus.patch
+
+* Sun Jan 16 2011 Kevin Fenzi <kevin@tummy.com> - 0.1.5-1
+- Update to 0.1.5
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.4-1
+- Update to 0.1.4
+
+* Sat Dec 04 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.3-2
+- Add patch to use redhat-menus
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.3-1
+- Update to 0.1.2
+
+* Wed Nov 03 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2
+
+* Thu Oct 07 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.1-2
+- Drop dependency on gtk-doc (#604352)
+
+* Fri Feb 26 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+
+* Tue Jan 12 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.0-2
+- Build gtk-doc
+
+* Tue Jan 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.0-1
+- Initial spec file

+ 16 - 9
g/gtk-xfce-engine/gtk-xfce-engine-vl.spec

@@ -1,18 +1,22 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Summary: 	Port of xfce engine to GTK+-2.0
 Name: 		gtk-xfce-engine
-Version: 	2.6.0
-Release: 	2%{?_dist_release}
+Summary: 	Port of xfce engine to GTK+-2.0
+Version: 	2.8.0
+Release: 	1%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPLv3
 URL: 		http://www.xfce.org/
+
 Source0:	http://www.xfce.org/archive/xfce-4.4.1/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-Requires:	gtk2 >= 2.10.0
-Requires:	glib2 >= 2.10.0
-BuildRequires: 	gtk2-devel >= 2.10.0
-BuildRequires: 	glib2-devel >= 2.10.0
+BuildRequires: 	glib2-devel >= 2.18.0
+BuildRequires: 	gtk2-devel >= 2.14.0
+BuildRequires:  pkgconfig
+Requires:	glib2 >= 2.18.0
+Requires:	gtk2 >= 2.14.0
 
 %description
 A port of Xfce engine to GTK+-2.0.
@@ -30,7 +34,7 @@ A port of Xfce engine to GTK+-2.0.
 %setup -q
 
 %build
-%configure --disable-static
+%configure --enable-silent-rules --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -55,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.0-1
+- new upstream release
+
 * Sun Jun 28 2009 NAKAMURA Kenta <kenta@vinelinux.org> 2.6.0-2
 - added compat32 package for x86_64 arch support.
 

+ 46 - 28
lib/libe/libexo/libexo-vl.spec

@@ -3,23 +3,27 @@
 Summary: extension library to Xfce
 Summary(ja): Xfce の拡張ライブラリ
 Name: libexo
-Version: 0.3.107
-Release: 2%{?_dist_release}
+Version: 0.6.0
+Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2
 URL: http://www.xfce.org/
 
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{srcname}-%{version}.tar.bz2
+# FIXME: upstream this patch
+Patch0:        exo-0.5.4-x86_64-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: glib2-devel >= 2.6.4
-BuildRequires: gtk2-devel >= 2.6.0
-BuildRequires: libxfce4util-devel >= 4.2.2
+BuildRequires: glib2-devel >= 2.27.0
+BuildRequires: gtk2-devel >= 2.14.0
+BuildRequires: intltool >= 0.31
+BuildRequires: libxfce4util-devel >= 4.8.0
 BuildRequires: libnotify-devel >= 0.4.0
-BuildRequires: hal-devel >= 0.5.7
-BuildRequires: python-devel pygtk2-devel
+BuildRequires: python-devel
+BuildRequires: pygtk2-devel
 BuildRequires: perl-URI
+BuildRequires: chrpath
 Requires(post): gtk2
 Requires(postun): gtk2
 
@@ -45,10 +49,8 @@ Summary: Header files and libraries for developing apps which will use %{name}
 Summary(ja): libexo の開発用ヘッダファイル及びライブラリ
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 2.6.4
 Requires: gtk2-devel >= 2.6.0
 Requires: libxfce4util-devel >= 4.2.2
-Requires: hal-devel >= 0.5.7
 Provides: %{srcname}-devel = %{version}-%{release}
 
 %description -n %{name}-devel
@@ -61,6 +63,7 @@ libexo-develはlibexoライブラリを用いるプログラムの開発に
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .x86_64-build
 
 %build
 %configure --disable-static
@@ -68,54 +71,69 @@ libexo-develはlibexoライブラリを用いるプログラムの開発に
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/exo-*/exo-helper-*
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-*/_exo.so
+#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gio/modules/libexo-module-*.so
+
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/exo/html _docs_to_include/
+rm -rf $RPM_BUILD_ROOT%{_docdir}/exo
+
+%find_lang exo-1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/hicolor;
-fi
 /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
 
 %postun 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/hicolor;
-fi
 /sbin/ldconfig
+if [ $1 -eq 0 ]; then
+    touch --no-create %{_datadir}/icons/hicolor
+    /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/hicolor;
+fi
+
+%posttrans
+gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 
-%files
+
+%files -f exo-1.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README THANKS TODO
-%{_sysconfdir}/xdg/xfce4/helpers.rc
-%{_sysconfdir}/xdg/xfce4/mount.rc
+%doc _docs_to_include/*
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 %{_libdir}/python?.?/site-packages/*
-%{_libexecdir}/*
+%{_libdir}/xfce4/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/pixmaps/exo-0.3
+%{_datadir}/pixmaps/exo-1
 %{_datadir}/pygtk/2.0/*
-%{_datadir}/xfce4/doc/*/*
 %{_datadir}/xfce4/helpers
-%{_localedir}/*/LC_MESSAGES/lib*.mo
 %{_mandir}/man1/*
 
 %files -n %{name}-devel
 %defattr(-,root,root)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/exo-0.3
-%{_datadir}/gtk-doc/html/exo-0.3
+%{_includedir}/exo-1
+%{_datadir}/gtk-doc/html/exo-1
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.6.0-1
+- new upstrem release
+
 * Thu Sep 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.3.107-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 149 - 0
lib/libx/libxfce4ui/libxfce4ui-vl.spec

@@ -0,0 +1,149 @@
+%global xfceversion 4.8
+
+Name:           libxfce4ui
+Summary:        Commonly used Xfce widgets
+Version:        4.8.0
+Release:        6%{?_dist_release}
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://xfce.org/
+
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0:         libxfce4ui-4.7.6-keyboard-shortcuts.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  gettext
+BuildRequires:  glib2-devel >= 2.12.0
+BuildRequires:  gtk-doc
+BuildRequires:  gtk2-devel >= 2.12.0
+BuildRequires:  intltool
+BuildRequires:  libSM-devel
+BuildRequires:  libxfce4util-devel >= %{xfceversion}
+BuildRequires:  startup-notification-devel >= 0.4
+BuildRequires:  xfconf-devel >= %{xfceversion}
+# FIXME: Enable libglade again one day
+#BuildRequires:  glade3-libgladeui-devel >= 3.5.0
+# FIXME: obsolete libxfcegui4 one day 
+#Provides:       libxfcegui4 = %{version}
+#Obsoletes:      libxfcegui4 < %{version}
+
+%description
+Libxfce4ui is used to share commonly used Xfce widgets among the Xfce
+applications.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel
+Requires:       libxfce4util-devel
+# FIXME: Enable libglade again one day
+#Requires:       glade3-libgladeui-devel
+Requires:       pkgconfig
+# FIXME: obsolete libxfcegui4 one day 
+#Provides:       libxfcegui4-devel = %{version}
+#Obsoletes:      libxfcegui4-devel < %{version}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .shortcut
+
+
+%build
+# FIXME: Enable libglade again one day
+%configure --enable-gtk-doc --disable-static --disable-gladeui
+# Remove rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+# The LD_LIBRARY_PATH hack is needed for --enable-gtk-doc
+# because lt-libxfce4ui-scan is linked against libxfce4ui
+export LD_LIBRARY_PATH=$( pwd )/libxfce4ui/.libs
+
+make %{?_smp_mflags} V=1
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%find_lang %{name}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README THANKS
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc TODO
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%doc %{_datadir}/gtk-doc/
+
+%changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.8.0-6
+- Initial build for Vine Linux
+
+* Wed Mar 16 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.8.0-5
+- Remove requirements for libxfcegui4-devel now that glade support was omitted
+
+* Tue Feb 22 2011 Rakesh Pandit <rakesh@fedoraproject.org> - 4.8.0-4
+- Disable glade as it still uses old API
+
+* Tue Feb 22 2011 Rakesh Pandit <rakesh@fedoraproject.org> - 4.8.0-3
+- Rebuild for new glade
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jan 16 2011 Kevin Fenzi <kevin@tummy.com> - 4.8.0-1
+- Update to 4.8.0 final. 
+
+* Sun Jan 02 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.6-1
+- Update to 4.7.6
+
+* Mon Nov 29 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.5-1
+- Update to 4.7.5
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+
+* Sun Sep 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+- Drop dependency on gtk-doc (#604399)
+
+* Tue Jul 27 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.2-2
+- Fix file conflict with libxfce4gui (#618719)
+
+* Fri May 21 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Wed May 19 2010 Kevin Fenzi <kevin@tummy.com> - 4.7.1-3
+- Rebuild for new glade version. 
+
+* Tue Jan 12 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.1-2
+- Fix license tag
+- Build gtk-doc
+
+* Tue Jan 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.1-1
+- Initial spec file, based on libxfcegui4.spec
+

+ 9 - 3
lib/libx/libxfce4util/libxfce4util-vl.spec

@@ -1,11 +1,14 @@
 Name: 		libxfce4util
 Summary: 	Utility library for the XFce4 desktop environment
-Version: 	4.6.2
-Release: 	2%{?_dist_release}
+Version: 	4.8.1
+Release: 	1%{?_dist_release}
+
+Group: 		System Environment/Libraries
 License:	LGPLv2+
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		System Environment/Libraries
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: 	glib2-devel >= 2.12.0
 BuildRequires: 	gtk-doc
@@ -59,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 24 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.1-1
+- new upstream release
+
 * Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 15 - 21
lib/libx/libxfcegui4/libxfcegui4-vl.spec

@@ -1,27 +1,25 @@
 Name: 		libxfcegui4
 Summary: 	GTK widgets for xfce
-Version: 	4.6.4
-Release: 	2%{?_dist_release}
+Version: 	4.8.0
+Release: 	1%{?_dist_release}
 
 Group: 		System Environment/Libraries
 License:	LGPLv2+
 URL: 		http://www.xfce.org/
 
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-4.4.2-xfce-exec-use-thunar.patch
-Patch1:         libxfcegui4-4.6.0-keyboard-shortcuts.patch
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: 	gtk2-devel >= 2.10.0
-BuildRequires:	libxfce4util-devel >= 4.6.0
-BuildRequires:  libxml2-devel >= 2.4.0
 BuildRequires:  gettext
-BuildRequires:  xfconf-devel >= 4.6.0
-BuildRequires:  startup-notification-devel
-BuildRequires:  libglade2-devel
-BuildRequires:  perl-XML-Parser
 BuildRequires:  intltool
+BuildRequires:  libglade2-devel
 BuildRequires:  libSM-devel
+BuildRequires:	libxfce4util-devel >= 4.8.0
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  pkgconfig
+BuildRequires:  startup-notification-devel >= 0.5
+BuildRequires:  xfconf-devel >= 4.6.0
 Requires(posttrans): gtk2
 Requires(postun): gtk2
       
@@ -31,10 +29,9 @@ The package includes various gtk widgets for Xfce.
 %package devel
 Summary:	developpment tools for libxfcegui4 library
 Group:		Development/Libraries
-Requires:	libxfcegui4 = %{version}-%{release}
-Requires:	libxfce4util-devel >= 4.6.0
-Requires:	gtk2-devel >= 2.12.0
-Requires:	xfconf-devel >= 4.6.0
+Requires:	%{name} = %{version}-%{release}
+Requires:	libxfce4util-devel >= 4.8.0
+Requires:	gtk2-devel >= 2.10.0
 
 %description devel
 Static libraries and header files for the libxfcegui4 library.
@@ -78,7 +75,6 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING 
-%{_sysconfdir}/xdg/xfce4
 %{_libdir}/lib*.so.*
 %{_libdir}/libglade/*/lib*.so
 %{_datadir}/icons/hicolor/*/*/*.png
@@ -86,17 +82,15 @@ fi
 
 %files devel
 %defattr(-, root, root)
+%{_includedir}/xfce4
 %{_libdir}/lib*.so
-#{_libdir}/glade3/modules/lib*.so
-#{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/xfce4
 %{_datadir}/gtk-doc/html/libxfcegui4
-#{_datadir}/glade3/catalogs/xfce4.xml
-#{_datadir}/glade3/catalogs/xfce4.xml.in
-#%{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+
 * Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 112 - 0
t/thunar-vfs/thunar-vfs-vl.spec

@@ -0,0 +1,112 @@
+# Review at https://bugzilla.redhat.com/show_bug.cgi?id=660159
+
+%global minorversion 1.2
+
+Name:           thunar-vfs
+Summary:        Virtual filesystem shipped with Thunar 1.0 and earlier releases
+Version:        1.2.0
+Release:        3%{?_dist_release}
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://thunar.xfce.org
+
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  dbus-glib-devel >= 0.34
+BuildRequires:  desktop-file-utils
+BuildRequires:  freetype2-devel
+BuildRequires:  gamin-devel 
+BuildRequires:  GConf2-devel >= 2.4.0
+BuildRequires:  gettext
+BuildRequires:  glib2-devel >= 2.12.0
+BuildRequires:  gtk-doc
+BuildRequires:  gtk2-devel >= 2.10.0
+BuildRequires:  hal-devel >= 0.5.7
+BuildRequires:  intltool
+BuildRequires:  libexo-devel >= 0.6.0
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libxfce4util-devel >= 4.8.0
+BuildRequires:  pkgconfig
+BuildRequires:  startup-notification-devel >= 0.4
+Conflicts:      Thunar < 1.1.0
+
+%description
+This package contains the virtual filesystem shipped with Thunar 1.0 and earlier
+releases. It provides compatibility for applications that still use thunar-vfs 
+while Thunar was ported to GVFS.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel >= 2.12.0
+Requires:       libexo-devel >= 0.6.0
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+
+%build
+%configure --disable-static --enable-gtk-doc 
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+%find_lang %{name}
+
+# remove duplicate docs
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+
+%check
+make tests
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog NEWS README 
+%doc docs/ThumbnailersCacheFormat.txt docs/README.volumes
+%{_libdir}/*.so.*
+%{_libdir}/thunar-vfs-*/
+%dir %{_datadir}/thumbnailers
+%{_datadir}/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
+
+%files devel
+%defattr(-,root,root,-)
+%doc HACKING TODO
+%doc %{_datadir}/gtk-doc/html/*
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/thunar-vfs-*.pc
+
+%changelog
+* Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.0-3
+- Initial build for Vine Linux
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jan 16 2011 Kevin Fenzi <kevin@tummy.com> - 1.2.0-1
+- Update to 1.2.0
+
+* Tue Nov 08 2010 Christoph Wickert <cwickert@fedoraproject.org> - 1.1.1-1
+- Initial package

+ 36 - 17
x/xfce-utils/xfce-utils-vl.spec

@@ -1,20 +1,23 @@
-Summary: 	Utilities for the XFce Desktop Environment
 Name: 		xfce-utils
-Version: 	4.6.2
+Summary: 	Utilities for the XFce Desktop Environment
+Version: 	4.8.0
 Release: 	1%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPLv2+
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 Source1:	XFce4.desktop
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:  libxfcegui4-devel >= 4.6.0
-BuildRequires:  libxfce4util-devel >= 4.6.0
+BuildRequires:  dbus-glib-devel >= 0.33
 BuildRequires:  gettext
-BuildRequires:  dbus-devel 
-BuildRequires:  dbus-glib-devel
-BuildRequires:  perl-XML-Parser
-BuildRequires:  intltool
+BuildRequires:  gtk2-devel >= 2.10.0
+BuildRequires:  intltool >= 0.31
+BuildRequires:  libxfce4ui-devel >= 4.8.0
+BuildRequires:  libxfce4util-devel >= 4.8.0
+BuildRequires:  pkgconfig
 
 %description
 This package includes utilities for the Xfce Desktop Environment.
@@ -23,7 +26,7 @@ This package includes utilities for the Xfce Desktop Environment.
 %setup -q
 
 %build
-%configure --disable-static 
+%configure --enable-silent-rules --disable-static 
 
 make %{?_smp_mflags}
 
@@ -34,28 +37,44 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 #mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
 #install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
 
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/xfce-utils/html _docs_to_include 
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun 
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS
+%doc _docs_to_include/html
+%config(noreplace) %{_sysconfdir}/xdg
 %{_bindir}/*
-%{_libexecdir}/xfce4
-#{_datadir}/apps
+%{_libdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/xfce4
 %{_datadir}/xsessions/xfce.desktop
-#{_sysconfdir}/X11/dm/Sessions/*
-#{_sysconfdir}/X11/gdm/Sessions
-#{_sysconfdir}/X11/wmsession.d
-%config(noreplace) %{_sysconfdir}/xdg
 
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-2
 - new upstream release
 - built with new toolchain

+ 23 - 14
x/xfce4-appfinder/xfce4-appfinder-vl.spec

@@ -1,16 +1,22 @@
 Summary: 	Appfinder for the XFce4 Desktop Environment
 Name: 		xfce4-appfinder
-Version: 	4.6.2
+Version: 	4.8.0
 Release: 	1%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPLv2+
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires: 	libxfce4util-devel >= 4.6.0
-BuildRequires: 	libxfcegui4-devel >= 4.6.0
-BuildRequires: 	xfconf-devel >= 4.6.0
-BuildRequires:  Thunar-devel
+BuildRequires:  garcon-devel >= 0.1.2
+BuildRequires:  glib2-devel >= 2.16.0
+BuildRequires:  gtk2-devel >= 2.14.0
+BuildRequires: 	libxfce4ui-devel >= 4.8.0
+BuildRequires: 	libxfce4util-devel >= 4.8.0
+BuildRequires: 	xfconf-devel >= 4.8.0
+BuildRequires:  pkgconfig
 
 %description
 xfce-appfinder shows system wide installed applications
@@ -19,7 +25,7 @@ xfce-appfinder shows system wide installed applications
 %setup -q
 
 %build
-%configure
+%configure --enable-silent-rules
 make
 
 %install
@@ -30,16 +36,17 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
@@ -49,9 +56,11 @@ fi
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*
-#{_datadir}/xfce4/doc/*
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.8.0-1
+- new upstream release
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.2-1
 - new upstream release
 - built with new toolchain

+ 11 - 5
x/xfce4-dev-tools/xfce4-dev-tools-vl.spec

@@ -1,11 +1,14 @@
-Summary:	Xfce developer tools
 Name:		xfce4-dev-tools
-Version:	4.6.0
+Summary:	Xfce developer tools
+Version:	4.8.0
 Release:	1%{?_dist_release}
-License:	GPL
+
+Group:		Development/Tools
+License:	GPLv2
 URL:		http://xfce.org/~benny/projects/xfce4-dev-tools/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group:		Development/Tools
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildArch:	noarch
      
@@ -18,7 +21,7 @@ Xfce developer's handbook.
 %setup -q
 
 %build
-%configure
+%configure 
 make
 
 %install
@@ -37,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/dev-tools
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+
 * Sat May 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
 - new upstream release
 - BuildArch: noarch

+ 22 - 27
x/xfce4-mixer/xfce4-mixer-vl.spec

@@ -1,28 +1,34 @@
-Summary: 	Volume control plugin for the XFce 4 panel
 Name: 		xfce4-mixer
-Version: 	4.6.1
+Summary: 	Volume control plugin for the Xfce 4 panel
+Version: 	4.8.0
 Release: 	1%{?_dist_release}
-License:	BSD
-URL: 		http://www.xfce.org/
-Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+
 Group: 		User Interface/Desktops
+License:	GPLv2
+URL: 		http://www.xfce.org/projects/xfce4-mixer
+
+Source0: 	http://archive.xfce.org/src/apps/%{name}/4.8/%{name}-%{version}.tar.bz2
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-Requires:	xfce4-panel >= 4.6.0
-BuildRequires:	libxfce4util-devel >= 4.6.0
-BuildRequires:	libxfcegui4-devel >= 4.6.0
-BuildRequires:	xfconf-devel >= 4.6.0
-BuildRequires:	xfce4-panel-devel >= 4.6.0
+BuildRequires:	glib2-devel >= 2.18.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.2
+BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	libxfce4ui-devel >= 4.8.0
+BuildRequires:	libxfce4util-devel >= 4.8.0
+BuildRequires:	xfconf-devel >= 4.8.0
+BuildRequires:	xfce4-panel-devel >= 4.8.0
+BuildRequires:	pkgconfig
+Requires:	xfce4-panel >= 4.8.0
 
 %description
-xfce4-mixer is the volume control plugin for the XFce 4 panel. Includes a
+xfce4-mixer is the volume control plugin for the Xfce 4 panel. Includes a
 simple sound mixer.
 
 %prep
 %setup -q
 
 %build
-%configure
+%configure 
 make
 
 %install
@@ -33,25 +39,10 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog COPYING AUTHORS
 %{_bindir}/xfce4-mixer
-#{_libdir}/xfce4/mcs-plugins/sound_settings.*
-#{_libdir}/xfce4/modules/lib*.so*
 %{_libexecdir}/xfce4/panel-plugins/
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
@@ -59,6 +50,10 @@ fi
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+- updated URL
+
 * Sat May 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.1-1
 - new upstream release
 

+ 54 - 38
x/xfce4-panel/xfce4-panel-vl.spec

@@ -1,24 +1,30 @@
-Summary: 	Next generation panel for Xfce
 Name: 		xfce4-panel
-Version: 	4.6.4
-Release: 	2%{?_dist_release}
+Summary: 	Next generation panel for Xfce
+Summary(ja): 	Xfce のための次世代パネル
+Version: 	4.8.0
+Release: 	1%{?_dist_release}
 
 Group: 		User Interface/Desktops
 License:	GPLv2+ and LGPLv2+
 URL: 		http://www.xfce.org/
 
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-#Patch0:	contents.xml.patch
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	cairo-devel >= 1.0.0
-BuildRequires:	libxfce4util-devel >= 4.6.0
-BuildRequires:	libxfcegui4-devel >= 4.6.0
-BuildRequires:	libxml2-devel >= 2.4.0
-BuildRequires:	libexo-devel >= 0.3.100
-BuildRequires:	libwnck-devel >= 2.20
-BuildRequires:	startup-notification-devel
-BuildRequires:	gettext intltool
+BuildRequires:	chrpath
+BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	garcon-devel >= 0.1.5
+BuildRequires:	gettext
+BuildRequires:	glib2-devel >= 2.18.0
+BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	intltool
+BuildRequires:	libexo-devel >= 0.6.0
+BuildRequires:	libwnck-devel >= 2.22
+BuildRequires:	libxfce4ui-devel >= 4.8.0
+BuildRequires:	libxfce4util-devel >= 4.8.0
+BuildRequires:	pkgconfig
+BuildRequires:	xfconf-devel >= 4.8.0
 
 Obsoletes: xfce4-iconbox xfce4-systray xfce4-toys xfce4-trigger-launcher
 Obsoletes: xfce4-showdesktop-plugin xfce4-taskbar-plugin
@@ -28,11 +34,13 @@ Obsoletes: xfce4-windowlist-plugin xfce4-xmms-plugin
 xfce4-panel is the panel for the XFce desktop environment
 
 %package devel
-Summary: Development headers for xfce4-panel
+Summary: Development headers for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libxfce4util-devel >= 4.6.0
-Requires: libxfcegui4-devel >= 4.6.0
+Requires: glib2-devel >= 2.18.0
+Requires: gtk2-devel >= 2.14.0
+Requires: libxfce4util-devel >= 4.8.0
 
 %description devel
 This package includes the header files you will need to build
@@ -65,60 +73,68 @@ plugins for xfce4-panel.
 #%patch0 -p1 -b .orig
 
 %build
-%configure --disable-static
+%configure --enable-silent-rules --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-%find_lang %{name}
+
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/migrate
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/wrapper
 
 ## remove unuse files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-#rm -rf $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/lib*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/lib*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/lib*.la
 
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/xfce4-panel/html _docs_to_include 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/xfce4-panel
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 /sbin/ldconfig
-
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS
+%doc _docs_to_include/html docs/README.gtkrc-2.0
 %dir %{_sysconfdir}/xdg/xfce4/panel/
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/*.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml
 %{_bindir}/*
-%{_libdir}/libxfce4panel.so.*
-%{_libdir}/xfce4/panel-plugins
+%{_libdir}/lib*.so.*
+%{_libdir}/xfce4/panel/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/xfce4/doc
-%{_datadir}/xfce4/panel-plugins
+%{_datadir}/icons/hicolor/*
+%{_datadir}/xfce4/panel/plugins
 
 %files devel
 %defattr(-, root,root,-)
-%{_includedir}/xfce4/libxfce4panel
-%{_libdir}/libxfce4panel.so
+%{_includedir}/xfce4/libxfce4panel-1.0
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%doc %{_datadir}/gtk-doc/html/libxfce4panel
+%doc %{_datadir}/gtk-doc/html/libxfce4panel-1.0
 
 %changelog
+* Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+
 * Thu Sep 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 59 - 30
x/xfce4-session/xfce4-session-vl.spec

@@ -1,25 +1,36 @@
+Name: 		xfce4-session
 Summary: 	Xfce Session manager
 Summary(ja):    Xfce セッションマネージャ
-Name: 		xfce4-session
-Version: 	4.6.2
-Release: 	2%{?_dist_release}
+Version: 	4.8.0
+Release: 	1%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPLv2+
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.us.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:		xfce4-session-4.5.92-hide-tips.patch
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires: 	libxfcegui4-devel >= 4.6.0
-BuildRequires:  startup-notification-devel
-BuildRequires:  gettext intltool
+BuildRequires:  chrpath
+BuildRequires:  dbus-devel >= 1.0.0
+BuildRequires:  dbus-glib-devel >= 0.73
+BuildRequires:  GConf2-devel >= 2.4.0
+BuildRequires:  gettext
+BuildRequires:  gtk2-devel >= 2.14.0
+BuildRequires:  intltool
+BuildRequires:  libwnck-devel >= 2.22.0
+BuildRequires: 	libxfce4ui-devel >= 4.8.0
+BuildRequires: 	libxfce4util-devel >= 4.8.0
+BuildRequires:  xfce4-panel-devel >= 4.8.0
+BuildRequires:  xfconf-devel >= 4.8.0
 BuildRequires:  xorg-x11-server-utils
-BuildRequires:  dbus-devel GConf2-devel
-BuildRequires:  libwnck-devel
-BuildRequires:  libglade2-devel
-BuildRequires:  dbus-glib-devel
-BuildRequires:  xfconf-devel
-BuildRequires:  libSM-devel
-Requires:	libxfcegui4 >= 4.6.0
+
+BuildRequires: 	hal-devel
+BuildRequires:  upower-devel
+BuildRequires:  ConsoleKit-devel
+BuildRequires:  polkit-devel
+#Requires:	libxfcegui4 >= 4.6.0
 Requires:	xorg-x11-server-utils
 Requires:       fortune-mod
 
@@ -30,7 +41,8 @@ xfce4-session is the session manager for the Xfce desktop environment.
 Summary:	Development files for xfce4-session
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libxfcegui4-devel >= 4.6.0
+Requires:	libxfce4ui-devel >= 4.8.0
+Requires:	xfconf-devel >= 4.8.0
 
 %description devel
 Header files for the Xfce Session Manager.
@@ -48,42 +60,57 @@ Additional splash screen engines for the Xfce Session Manager.
 %patch0 -p1 -b .disable-tips
 
 %build
-%configure --enable-gnome --enable-final --disable-static
+%configure --enable-silent-rules --enable-gnome --enable-final --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-%find_lang %{name}
+
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/session/xfsm-shutdown-helper
 
 ## remove unuse files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/xfce4/splash/engines/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/xfce4/session/splash-engines/*.la
+
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* _docs_to_include
+
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc _docs_to_include/html
 %dir %{_sysconfdir}/xdg/autostart/
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 %{_bindir}/*
 %{_libdir}/lib*.so.*
-#{_libdir}/xfce4/mcs-plugins/*
-%{_libdir}/xfce4/splash/engines/libmice.*
-%{_libexecdir}/xfsm-shutdown-helper
+%{_libdir}/xfce4/panel/plugins/*.so
+%dir %{_libdir}/xfce4/session
+%{_libdir}/xfce4/session/splash-engines/libmice.so
+%{_libdir}/xfce4/session/xfsm-shutdown-helper
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/xfce4/*
@@ -93,17 +120,19 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %defattr(-,root,root)
 %{_includedir}/xfce4/xfce4-session-4.6
 %{_libdir}/lib*.so
-#{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 
 %files engines
 %defattr(-,root,root)
-%{_libdir}/xfce4/splash/engines/libbalou.*
-%{_libdir}/xfce4/splash/engines/libsimple.*
-%{_libexecdir}/balou-*
+%{_libdir}/xfce4/session/balou-*-theme
+%{_libdir}/xfce4/session/splash-engines/libbalou.*
+%{_libdir}/xfce4/session/splash-engines/libsimple.*
 %{_datadir}/themes/Default/balou/
 
 %changelog
+* Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.6.2-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

+ 23 - 13
x/xfce4-settings/xfce4-settings-vl.spec

@@ -1,13 +1,14 @@
 Name:           xfce4-settings
-Version:        4.6.5
-Release:        1%{?_dist_release}
 Summary:        Settings Manager for Xfce
 Summary(ja):    Xfce の設定マネージャー
+Version:        4.8.0
+Release:        1%{?_dist_release}
 
 Group:          User Interface/Desktops
 # xfce4-settings-helper is GPLv2 only. 
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
+
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 Patch0:         xfce4-settings-4.6.4-libxklavier5.patch
 # Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6236
@@ -16,19 +17,25 @@ Patch1: 	xfce4-settings-4.6.4-dsofix.patch
 # use vendor's artwork
 #Patch10:        xfce4-settings-4.6.0-fedora.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires: dbus-glib-devel >= 0.34
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
+BuildRequires: glib2-devel >= 2.16.0
+BuildRequires: gtk2-devel >= 2.14.0
 BuildRequires: intltool
-BuildRequires: libexo-devel >= 0.3.100
-BuildRequires: libxfcegui4-devel >= 4.6
-BuildRequires: libxfce4util-devel >= 4.6
-BuildRequires: xfconf-devel >= 4.6
-BuildRequires: libglade2-devel
-BuildRequires: libwnck-devel
-BuildRequires: desktop-file-utils >= 0.7
-BuildRequires: libnotify-devel
-BuildRequires: libcanberra-devel
-BuildRequires: libxklavier-devel >= 4.0
+BuildRequires: libexo-devel >= 0.6.0
+BuildRequires: libxfce4ui-devel >= 4.8.0
+BuildRequires: libxfce4util-devel >= 4.8.0
+BuildRequires: libnotify-devel >= 0.1.3
+BuildRequires: libX11-devel 
+BuildRequires: libXcursor-devel >= 1.1.0 
+BuildRequires: libXi-devel >= 1.2.0 
+BuildRequires: libxklavier-devel 
+BuildRequires: libXrandr-devel >= 1.2.0 
+BuildRequires: pkgconfig
+BuildRequires: xfconf-devel >= 4.8.0
+BuildRequires: xorg-x11-proto-devel
 Requires: xfconf
 
 Obsoletes: xfce-mcs-manager < 4.4.3-2
@@ -115,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.8.0-1
+- new upstream release
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.5-1
 - new upstream release
 - dropt Patch0

+ 14 - 6
x/xfconf/xfconf-vl.spec

@@ -1,7 +1,7 @@
 Name:           xfconf
 Summary:        Hierarchical configuration system for Xfce
-Version:        4.6.2
-Release:        2%{?_dist_release}
+Version:        4.8.0
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -10,14 +10,17 @@ URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  glib2-devel >= 2.12.0
-BuildRequires:  libxfce4util-devel >= 4.6.0
+BuildRequires:  chrpath
 BuildRequires:  dbus-devel >= 1.0.0
 BuildRequires:  dbus-glib-devel >= 0.72
+BuildRequires:  gettext
+BuildRequires:  glib2-devel >= 2.18.0
+BuildRequires:  intltool
+BuildRequires:  libxfce4util-devel >= 4.8.0
 BuildRequires:  perl-ExtUtils-Depends >= 0.300
 BuildRequires:  perl-ExtUtils-PkgConfig >= 1.000
 BuildRequires:  perl-Glib >= 1.020
-BuildRequires:  gettext
+BuildRequires:  pkgconfig
 
 Obsoletes: libxfce4mcs < 4.4.3-3
 
@@ -64,6 +67,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/xfconf/xfconfd
+
 # remove unneeded la files. 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 # remove perl temp file
@@ -92,8 +97,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS TODO COPYING
 %{_libdir}/lib*.so.*
+%{_libdir}/xfce4/xfconf/xfconfd
 %{_bindir}/xfconf-query
-%{_libexecdir}/xfconfd
 %{_datadir}/dbus-1/services/org.xfce.Xfconf.service
 %ghost %dir %{_libdir}/xfce4/
 %ghost %dir %{_libexecdir}/xfce4/
@@ -112,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.8.0-1
+- new upstream release
+
 * Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 37 - 31
x/xfdesktop/xfdesktop-vl.spec

@@ -1,41 +1,51 @@
-Summary: 	Desktop manager for the XFce Desktop Environment
 Name: 		xfdesktop
-Version: 	4.6.2
+Summary: 	Desktop manager for the Xfce
+Summary(ja): 	Xfce デスクトップマネージャ
+Version: 	4.8.0
 Release: 	1%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPLv2+
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libxfcegui4-devel >= 4.6.0
-BuildRequires:	xfce4-panel-devel >= 4.6.0
-BuildRequires:	libxml2-devel
+BuildRequires:	dbus-glib-devel >= 0.34
+BuildRequires:	garcon-devel >= 0.1.2
 BuildRequires:	gettext
-BuildRequires:	libexo-devel
-BuildRequires:	Thunar-devel
-BuildRequires:	dbus-glib-devel
-BuildRequires:	dbus-devel
-BuildRequires:	libwnck-devel
-BuildRequires:	libglade2-devel
-BuildRequires:	libxfce4menu-devel
-BuildRequires:	xfconf-devel
+BuildRequires:	glib2-devel >= 2.18.0
+BuildRequires:	gtk2-devel >= 2.14.0
 BuildRequires:	intltool
+BuildRequires:	libexo-devel >= 0.6.0
+BuildRequires:	libnotify-devel >= 0.4.0
 BuildRequires:	libSM-devel
+BuildRequires:	libwnck-devel >= 2.22.0
+BuildRequires:	libxfce4ui-devel >= 4.8.0
+BuildRequires:	libxfce4util-devel >= 4.8.0
+BuildRequires:	pkgconfig
+BuildRequires:	Thunar-devel >= 1.2.0
+BuildRequires:	xfconf-devel >= 4.8.0
 Requires(post): gtk2
 
 %description
-xfdesktop contain a desktop manager for the XFce Desktop Environment
+xfdesktop contain a desktop manager for Xfce
 
 %prep
 %setup -q
 
 %build
-%configure
+%configure --enable-silent-rules
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html _docs_to_include
+
 %find_lang %{name}
 
 %clean
@@ -43,35 +53,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-/sbin/ldconfig
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
-/sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS
-%{_sysconfdir}/xdg/menus/*
+%doc _docs_to_include/html
 %{_bindir}/*
-%{_libdir}/xfce4/modules
-%{_libexecdir}/xfce4/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*
 %{_datadir}/pixmaps/*
 %{_datadir}/xfce4/backdrops
-%{_datadir}/xfce4/doc
-%{_datadir}/xfce4/panel-plugins/*.desktop
-%{_datadir}/desktop-directories
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-1
 - new upstream release
 - built with new toolchain

+ 8 - 2
x/xfwm4-themes/xfwm4-themes-vl.spec

@@ -1,11 +1,14 @@
 Summary: 	Additionnal themes for xfwm4
 Name: 		xfwm4-themes
 Version: 	4.6.0
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
+
+Group: 		User Interface/Desktops
 License:	GPL
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildArch:	noarch
 Requires:	xfwm4
@@ -34,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes
 
 %changelog
+* Sat Apr  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-2
+- rebuilt with xfce4-4.8.0
+
 * Fri May 22 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
 - new upstream release
 

+ 52 - 17
x/xfwm4/xfwm4-vl.spec

@@ -1,23 +1,35 @@
-Summary: 	Next generation window manager for XFce
 Name: 		xfwm4
-Version: 	4.6.2
+Summary: 	Next generation window manager for XFce
+Summary(ja): 	XFce のための次世代ウィンドウマネージャ
+Version: 	4.8.0
 Release: 	1%{?_dist_release}
-License:	GPL
+
+Group: 		User Interface/Desktops
+License:	GPLv2
 URL: 		http://www.xfce.org/
+
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-Group: 		User Interface/Desktops
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel >= 2.10.0
-BuildRequires:	libglade2-devel >= 2.0.0
-BuildRequires:	libxfce4util-devel >= 4.6.0
-BuildRequires:	libxfcegui4-devel >= 4.6.0
-BuildRequires:	xfconf-devel >= 4.6.0
-BuildRequires:	libwnck-devel >= 2.12
+BuildRequires:	chrpath
 BuildRequires:	dbus-devel >= 1.0.0
 BuildRequires:	dbus-glib-devel >= 0.72
-BuildRequires:	startup-notification-devel >= 0.5
+BuildRequires:	gettext
+BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	intltool
+BuildRequires:	libglade2-devel >= 2.0.0
+BuildRequires:	libSM-devel
+BuildRequires:	libwnck-devel >= 2.22
+BuildRequires:	libxfce4ui-devel >= 4.8.0
+BuildRequires:	libxfce4util-devel >= 4.8.0
+BuildRequires:	libxfcegui4-devel >= 4.8.0
 BuildRequires:	libXrandr-devel
+BuildRequires:	pkgconfig
+BuildRequires:	startup-notification-devel >= 0.5
+BuildRequires:	xfconf-devel >= 4.8.0
 Requires:	xfconf
+Requires(post): gtk2
+Requires(postun): gtk2
 
 %description
 xfwm4 is a window manager compatable with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -26,30 +38,53 @@ xfwm4 is a window manager compatable with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 %setup -q
 
 %build
-%configure
+%configure --enable-silent-rules
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' mandir=%{_mandir}
+
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/xfwm4/helper-dialog
+
+rm -rf _docs_to_include
+mkdir -p _docs_to_include
+mv $RPM_BUILD_ROOT%{_docdir}/xfwm4/html _docs_to_include 
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%posttrans 
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun 
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc example.gtkrc-2.0 README INSTALL TODO COPYING AUTHORS COMPOSITOR
+%doc _docs_to_include/html
 %{_bindir}/*
-#%{_libdir}/xfce4/*
-%{_libexecdir}/xfce4/xfwm4
+%{_libdir}/xfce4/xfwm4/helper-dialog
 %{_datadir}/applications
-%{_datadir}/icons
+%{_datadir}/icons/hicolor/*
 %{_datadir}/themes
 %{_datadir}/xfwm4
-%{_datadir}/xfce4/doc
 
 %changelog
+* Mon Mar 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-1
+- new upstream release
+- added %%post, %%posttrans and %%postun section
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-1
 - new upstream release
 - built with new toolchain