Author: glen Date: Tue Dec 21 23:32:11 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- install icon properly (not create dir by icon name)
- misc cosmetics
---- Files affected:
packages/wine:
wine.spec (1.391.2.11 -> 1.391.2.12)
---- Diffs:
================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.391.2.11 packages/wine/wine.spec:1.391.2.12
--- packages/wine/wine.spec:1.391.2.11 Thu Dec 16 15:00:55 2010
+++ packages/wine/wine.spec Wed Dec 22 00:32:06 2010
@@ -71,6 +71,7 @@
BuildRequires: gnutls-devel
%{?with_gstreamer:BuildRequires: gstreamer-plugins-base-devel}
BuildRequires: hal-devel
+BuildRequires: icoutils
%{?with_jack:BuildRequires: jack-audio-connection-kit-devel}
BuildRequires: lcms-devel
BuildRequires: libgphoto2-devel
@@ -275,6 +276,9 @@
%patch7 -p1
%build
+icotool -x --width=32 --height=32 --bit-depth=32 -o .
dlls/user32/resources/oic_winlogo.ico
+mv -f oic_winlogo_*.png %{name}.png
+
%{__autoconf}
%{__autoheader}
%configure \
@@ -323,13 +327,11 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir}
-
-install aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
+install -p tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir}
+cp -a aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
install -d \
$RPM_BUILD_ROOT%{_winedir}/windows/{system,Desktop,Favorites,Fonts} \
@@ -370,21 +372,21 @@
# /sbin/chstk -e $RPM_BUILD_ROOT%{_bindir}/wine
-programs="notepad regedit regsvr32 wineconsole winefile winemine winepath"
-
-BZZZ=`pwd`
-rm -f files.so; touch files.so
-rm -f files.programs; touch files.programs
+dir=$(pwd)
+> files.so
+> files.programs
cd $RPM_BUILD_ROOT%{_libdir}/wine
for f in *.so; do
case $f in
-
d3d8.dll.so|d3d9.dll.so|d3dx8.dll.so|glu32.dll.so|opengl32.dll.so|sane.ds.so|twain.dll.so|twain_32.dll.so|winealsa.drv.so|winejack.drv.so|winenas.drv.so)
- ;;
- *)
- echo "%attr(755,root,root) %{_libdir}/wine/$f"
>>$BZZZ/files.so
+
d3d8.dll.so|d3d9.dll.so|d3dx8.dll.so|glu32.dll.so|opengl32.dll.so|sane.ds.so|twain.dll.so|twain_32.dll.so|winealsa.drv.so|winejack.drv.so|winenas.drv.so)
+ ;;
+ *)
+ echo "%attr(755,root,root) %{_libdir}/wine/$f" >> $dir/files.so
esac
done
cd -
+
+programs="notepad regedit regsvr32 wineconsole winefile winemine winepath"
for p in $programs; do
echo "%attr(755,root,root) %{_bindir}/$p" >> files.programs
echo "%attr(755,root,root) %{_libdir}/wine/$p.exe.so" >> files.programs
@@ -394,11 +396,11 @@
done
install -d $RPM_BUILD_ROOT%{_winedir}/gecko
-install %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}/wine.svg
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install programs/winetest/winetest.svg $RPM_BUILD_ROOT%{_pixmapsdir}/wine.svg
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -462,7 +464,7 @@
%{_winedir}
%{_desktopdir}/wine.desktop
%{_desktopdir}/wine-uninstaller.desktop
-%{_pixmapsdir}/wine.svg
+%{_pixmapsdir}/%{name}.png
%files programs -f files.programs
%defattr(644,root,root,755)
@@ -550,6 +552,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.391.2.12 2010/12/21 23:32:06 glen
+- install icon properly (not create dir by icon name)
+- misc cosmetics
+
Revision 1.391.2.11 2010/12/16 14:00:55 lisu
- drop duplicate manpages
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wine/wine.spec?r1=1.391.2.11&r2=1.391.2.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
