rpms/gdesklets/devel gdesklets.spec,1.1,1.2

[Luya Tshimbalanga (luya)]

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207/devel

Modified Files:
	gdesklets.spec 
Log Message:
auto-import gdesklets-0.35.2-22 on branch devel from gdesklets-0.35.2-22.src.rpm


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdesklets.spec	7 Dec 2005 22:14:49 -0000	1.1
+++ gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        20%{?dist}
+Release:        22%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -12,17 +12,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-############################################################################
-#
-# Starting from 0.35.x, gDesklets no longer requires GConf. Future maintainers
-# must avoid using it.
-#
-##########################################################################
+#############################################################
+#							    #
+# Starting from 0.35.x, gDesklets no longer requires GConf. #
+#							    #
+#############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0
-# Requires:	gnome-python2-gconf >= 2.6.0
+BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
+Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
@@ -35,27 +34,23 @@
 tiny displays that sit on your desktop such as status meters, icon
 bars, weather sensors, news tickers.
 
+
 %prep
 %setup -q -n gDesklets-%{version}
 %patch0 -p1 
 
 %build
 
+
 %configure \
-  --disable-schemas-install
+ --disable-schemas-install
 make %{?_smp_mflags}
 
-
-#%_install
-#rm -rf ${RPM_BUILD_ROOT}
-#make -e install DESTDIR=${RPM_BUILD_ROOT}
-
 %install
-[ -n $RPM_BUILD_ROOT -a $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
-env DESTDIR=$RPM_BUILD_ROOT make -e install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-
 desktop-file-install --vendor=fedora  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
   --add-category X-Fedora \
@@ -64,7 +59,6 @@
   --add-category Utility \
         data/%{name}.desktop
 
-
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
 ln -sf ../../%{_libdir}/%{name}/%{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}
@@ -85,7 +79,7 @@
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
@@ -105,6 +99,14 @@
 
 
 %changelog
+* Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
+- Added desktop-file-utils for build requirement
+- Clean up
+
+* Tue Dec 6 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-21
+- Removed unnecessary comment  
+- More clean up
+
 * Tue Dec 6 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-20
 - Clean up 
 - Fixed the right path for symbolic link