SPECS (AC-branch): wine.spec - more HEAD merge (giflib, trigger)

[havner]

Author: havner                       Date: Thu Aug 10 17:04:11 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- more HEAD merge (giflib, trigger)

---- Files affected:
SPECS:
   wine.spec (1.220.2.8.2.3 -> 1.220.2.8.2.4) 

---- Diffs:

================================================================
Index: SPECS/wine.spec
diff -u SPECS/wine.spec:1.220.2.8.2.3 SPECS/wine.spec:1.220.2.8.2.4
--- SPECS/wine.spec:1.220.2.8.2.3	Thu Aug 10 18:58:27 2006
+++ SPECS/wine.spec	Thu Aug 10 19:04:06 2006
@@ -57,10 +57,10 @@
 BuildRequires:	fontforge
 BuildRequires:	freetype-devel >= 2.0.5
 BuildRequires:	glut-devel
+BuildRequires:	giflib-devel
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
-BuildRequires:	libungif-devel
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	ncurses-devel
 # db2* failed previously - probably openjade or opensp bug
@@ -339,7 +339,7 @@
 
 %triggerpostun -- wine < 1:0.9.15
 if [ -f /var/lock/subsys/wine ]; then
-	/etc/rc.d/init.d/wine stop >&2
+	rm -f /var/lock/subsys/wine
 fi
 if [ -x /sbin/chkconfig ]; then
 	/sbin/chkconfig --del wine
@@ -469,6 +469,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220.2.8.2.4  2006/08/10 17:04:06  havner
+- more HEAD merge (giflib, trigger)
+
 Revision 1.220.2.8.2.3  2006/08/10 16:58:27  havner
 - 0.9.19
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wine.spec?r1=1.220.2.8.2.3&r2=1.220.2.8.2.4&f=u