SPECS (DEVEL): gnome-applets.spec, libgweather.spec - move devel t...

[patrys]

Author: patrys                       Date: Wed Jan 16 11:46:43 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- move devel to libgweather
- make gnome-applets build with recent s-t-b

---- Files affected:
SPECS:
   gnome-applets.spec (1.195.2.2 -> 1.195.2.3) , libgweather.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/gnome-applets.spec
diff -u SPECS/gnome-applets.spec:1.195.2.2 SPECS/gnome-applets.spec:1.195.2.3
--- SPECS/gnome-applets.spec:1.195.2.2	Wed Jan 16 03:38:34 2008
+++ SPECS/gnome-applets.spec	Wed Jan 16 12:46:37 2008
@@ -11,6 +11,7 @@
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.21/%{name}-%{version}.tar.bz2
 # Source0-md5:	dba81fa85a3b238b1a3b600865c2201d
+Patch0:		%{name}-stb.patch
 Patch1:		%{name}-m4_fix.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.19.1
@@ -78,20 +79,6 @@
 ĐŸĐ°ĐşĐľŃ‚ gnome-applets сОдорМит аппНоты ĐŸĐ°Đ˝ĐľĐťĐ¸ GNOME, ŃƒĐ˛ĐľĐťĐ¸Ń‡Đ¸Đ˛Đ°ŃŽŃ‰Đ¸Đľ
 ĐşĐžĐźŃ„ĐžŃ€Ń‚Đ˝ĐžŃŃ‚ŃŒ райОты в сродо GNOME.
 
-%package devel
-Summary:	Header files for gnome-applets
-Summary(pl.UTF-8):	Pliki nagłówkowe gnome-applets
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	GConf2-devel >= 2.19.1
-Requires:	gtk+2-devel >= 2:2.12.0
-
-%description devel
-Header files for gnome-applets.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe gnome-applets.
-
 %package accessx-status
 Summary:	Keyboard Accessibility Status applet
 Summary(pl.UTF-8):	Aplet stanu dostepności klawiatury
@@ -333,6 +320,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -455,10 +443,6 @@
 %post gweather
 /sbin/ldconfig
 %scrollkeeper_update_post
-%gconf_schema_install gweather.schemas
-
-%preun gweather
-%gconf_schema_uninstall gweather.schemas
 
 %postun gweather
 /sbin/ldconfig
@@ -575,11 +559,6 @@
 %lang(es_VE) %dir %{_datadir}/locale/es_VE
 %lang(es_VE) %dir %{_datadir}/locale/es_VE/LC_MESSAGES
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
-
 %files accessx-status -f accessx-status.lang
 %defattr(644,root,root,755)
 %doc accessx-status/ChangeLog
@@ -642,11 +621,8 @@
 %defattr(644,root,root,755)
 %doc gweather/ChangeLog
 %attr(755,root,root) %{_libdir}/gweather-applet-2
-%attr(755,root,root) %{_libdir}/libgweather.so*
 %{_libdir}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
 %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-%{_datadir}/%{name}/gweather
-%{_sysconfdir}/gconf/schemas/gweather.schemas
 
 %files invest
 %defattr(644,root,root,755)
@@ -780,6 +756,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.195.2.3  2008-01-16 11:46:37  patrys
+- move devel to libgweather
+- make gnome-applets build with recent s-t-b
+
 Revision 1.195.2.2  2008-01-16 02:38:34  patrys
 - 2.21.4
 - drop patches not merged upstream (liboobs)

================================================================
Index: SPECS/libgweather.spec
diff -u SPECS/libgweather.spec:1.2 SPECS/libgweather.spec:1.3
--- SPECS/libgweather.spec:1.2	Tue Jan 15 16:26:59 2008
+++ SPECS/libgweather.spec	Wed Jan 16 12:46:37 2008
@@ -31,6 +31,7 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk+2-devel >= 2:2.12.0
+Obsoletes:	gnome-applets-devel <= 2.21.4
 
 %description devel
 Header files for libgweather.
@@ -102,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008-01-16 11:46:37  patrys
+- move devel to libgweather
+- make gnome-applets build with recent s-t-b
+
 Revision 1.2  2008-01-15 15:26:59  patrys
 - add epoch to glib2 dep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-applets.spec?r1=1.195.2.2&r2=1.195.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgweather.spec?r1=1.2&r2=1.3&f=u