Author: patrys                       Date: Tue Mar 11 20:15:29 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   libwnck.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/libwnck.spec
diff -u SPECS/libwnck.spec:1.83 SPECS/libwnck.spec:1.84
--- SPECS/libwnck.spec:1.83     Thu Jan 10 07:09:22 2008
+++ SPECS/libwnck.spec  Tue Mar 11 21:15:24 2008
@@ -6,25 +6,27 @@
 Summary:       General Window Manager interfacing for GNOME utilities
 Summary(pl.UTF-8):     Interfejs General Window Manager dla narzędzi GNOME
 Name:          libwnck
-Version:       2.20.3
+Version:       2.22.0
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: 0f0f54764993497ed02f34a44056efb2
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: db7b86ef93ed08ee1562cd08206f9c66
 Patch0:                %{name}-compiz.patch
-Patch1:                %{name}-link.patch
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gtk+2-devel >= 2:2.12.0
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.8}
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gtk+2-devel >= 2:2.12.5
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.9}
 BuildRequires: gtk-doc-automake
 BuildRequires: intltool >= 0.36.2
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: startup-notification-devel >= 0.8
 BuildRequires: xorg-lib-libXres-devel
-Requires:      gtk+2 >= 2:2.12.0
+Requires:      gtk+2 >= 2:2.12.5
 # [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +44,7 @@
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja dla libwnck
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gtk+2-devel >= 2:2.12.0
+Requires:      gtk+2-devel >= 2:2.12.5
 Requires:      startup-notification-devel >= 0.8
 Requires:      xorg-lib-libXres-devel
 
@@ -80,10 +82,6 @@
 %setup -q
 # needs update!
 #%patch0 -p0
-%patch1 -p1
-
-sed -i -e '[EMAIL PROTECTED]@latin#' po/LINGUAS
-mv po/[EMAIL PROTECTED],latin}.po
 
 %build
 %{__glib_gettextize}
@@ -91,6 +89,7 @@
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        %{?with_apidocs:--enable-gtk-doc} \
@@ -103,6 +102,8 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
+
 %find_lang %{name}
 
 %clean
@@ -141,12 +142,42 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2008-03-11 20:15:24  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.81.2.8  2008-03-11 20:13:29  patrys
+- 2.22.0
+
+Revision 1.81.2.7  2008-02-29 14:06:14  megabajt
+- updated to 2.21.92
+
+Revision 1.81.2.6  2008-02-11 21:36:28  megabajt
+- updated to 2.21.91
+
+Revision 1.81.2.5  2008-01-28 13:19:12  megabajt
+- updated to 2.21.90
+
+Revision 1.81.2.4  2008-01-23 18:42:21  qboosh
+- glib2 epoch
+
+Revision 1.81.2.3  2008-01-15 15:08:16  patrys
+- 2.21.5
+
 Revision 1.83  2008-01-10 06:09:22  qboosh
 - ghost soname symlink
 
+Revision 1.81.2.2  2008-01-09 17:29:40  megabajt
+- updated to 2.21.2.1
+
 Revision 1.82  2008-01-09 16:29:04  megabajt
 - updated to 2.20.3
 
+Revision 1.81.2.1  2007-12-19 20:40:40  patrys
+- 2.21.2
+- patch1 no longer relevant
+
+>>>>>>> 1.81.2.8
 Revision 1.81  2007-11-27 18:36:04  megabajt
 - updated to 2.20.2
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libwnck.spec?r1=1.83&r2=1.84&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to