Browse Source

rebuilt wirh rpm-4.8.1

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

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

@@ -1,8 +1,8 @@
-Summary: 	Utility library for the XFce4 desktop environment
 Name: 		libxfce4util
+Summary: 	Utility library for the XFce4 desktop environment
 Version: 	4.6.2
-Release: 	1%{?_dist_release}
-License:	LGPL
+Release: 	2%{?_dist_release}
+License:	LGPLv2+
 URL: 		http://www.xfce.org/
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 Group: 		System Environment/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-2
+- rebuilt with rpm-4.8.1 for pkg-config
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-1
 - new upstream release
 - built with new toolchain

+ 20 - 10
lib/libx/libxfcegui4/libxfcegui4-vl.spec

@@ -1,13 +1,15 @@
-Summary: 	GTK widgets for xfce
 Name: 		libxfcegui4
+Summary: 	GTK widgets for xfce
 Version: 	4.6.4
-Release: 	1%{?_dist_release}
-License:	LGPL
+Release: 	2%{?_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
-Group: 		System Environment/Libraries
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: 	gtk2-devel >= 2.10.0
@@ -20,7 +22,8 @@ BuildRequires:  libglade2-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  intltool
 BuildRequires:  libSM-devel
-Requires(post):	gtk2
+Requires(posttrans): gtk2
+Requires(postun): gtk2
       
 %description
 The package includes various gtk widgets for Xfce.
@@ -32,7 +35,6 @@ Requires:	libxfcegui4 = %{version}-%{release}
 Requires:	libxfce4util-devel >= 4.6.0
 Requires:	gtk2-devel >= 2.12.0
 Requires:	xfconf-devel >= 4.6.0
-Requires:	pkgconfig
 
 %description devel
 Static libraries and header files for the libxfcegui4 library.
@@ -59,14 +61,19 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/*/*.la
 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 &> /dev/null || :
+
+%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)
@@ -90,6 +97,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 #%{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-2
+- rebuilt with rpm-4.8.1 for pkg-config
+
 * Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 - built with new toolchain

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

@@ -1,14 +1,15 @@
 Name:           xfconf
-Version:        4.6.2
-Release:        1%{?_dist_release}
 Summary:        Hierarchical configuration system for Xfce
+Version:        4.6.2
+Release:        2%{?_dist_release}
 
-Group:          System Environment/Base
-License:        GPLv2
+Group:          System Environment/Libraries
+License:        GPLv2+
 URL:            http://www.xfce.org/
+
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  glib2-devel >= 2.12.0
 BuildRequires:  libxfce4util-devel >= 4.6.0
 BuildRequires:  dbus-devel >= 1.0.0
@@ -29,7 +30,6 @@ beneath the channel nodes are called "properties."
 Summary: Development tools for xfconf
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 Requires: glib2-devel >= 2.12.0
 Requires: dbus-devel >= 1.0.0
 Requires: dbus-glib-devel >= 0.72
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.2-2
+- rebuilt with rpm-4.8.1 for pkg-config
+
 * Sat May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.2-1
 - new upstream release
 - built with new toolchain