rpms/gdesklets/devel NullObject-1.0-fix.patch, NONE, 1.1 gdesklets.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Luya Tshimbalanga (luya) fedora-extras-commits at redhat.com
Wed Dec 7 22:14:51 UTC 2005


Author: luya

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

Modified Files:
	.cvsignore sources 
Added Files:
	NullObject-1.0-fix.patch gdesklets.spec 
Log Message:
auto-import gdesklets-0.35.2-20 on branch devel from gdesklets-0.35.2-20.src.rpm

NullObject-1.0-fix.patch:

--- NEW FILE NullObject-1.0-fix.patch ---
 NullObject.py |    2 ++
 1 files changed, 2 insertions(+)

Index: gDesklets-0.35.2/NullObject.py
===================================================================
--- gDesklets-0.35.2.orig/NullObject.py	2005-11-29 16:35:03.000000000 -0600
+++ gDesklets-0.35.2/NullObject.py	2005-11-29 16:36:30.000000000 -0600
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 class __Null:
 
     """Null object that does __nothing__"""


--- NEW FILE gdesklets.spec ---
Name:           gdesklets
Version:        0.35.2
Release:        20%{?dist}
Summary:        Advanced architecture for desktop applets

Group:          User Interface/Desktops
License:        GPL

URL:            http://gdesklets.gnomedesktop.org/
Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
Patch0:		NullObject-1.0-fix.patch
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.
#
##########################################################################

BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1
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
Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
Requires(postun): shared-mime-info


%description
'gDesklets' provides an advanced architecture for desktop applets -
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
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
%find_lang %{name}


desktop-file-install --vendor=fedora  \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
  --add-category X-Fedora \
  --add-category Accessories \
  --add-category Application \
  --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}

rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%clean
rm -rf ${RPM_BUILD_ROOT}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
%{_bindir}/%{name}
%{_bindir}/%{name}-display-thumbnailer
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%{_libdir}/%{name}/
%{_mandir}/man1/*




%changelog
* Tue Dec 6 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-20
- Clean up 
- Fixed the right path for symbolic link

* Sat Dec 3 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-19
- Added disable-schemas-install on %_configure
- Trying to symlink using nrpms method based on FC3 version

* Tue Nov 29 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-18
- Added patch against NullObject.py (thanks jwb)

* Tue Nov 29 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-17
- Reorganized names and fixed %_install


* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-16
- Rebuild

* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-15
- Fixed %_install

* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-14
- Bump

* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-13
- Bump

* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-12
- Removed pygtk2

* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-11
- Added distribution version
- Clarified the note about GConf instead of gconf

* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-10
- Added libgnomeui-devel to test some sensors

* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-9
- Cleaned up and removed unnecesary buildrequires

* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-8
- Fixed error on mime.cache

* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-7
- Rebuilt

* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-6
- Rebuilt

* Wed Nov 16 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-5
- Added desktop-file-utils command for post and postun

* Wed Nov 16 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-4
- Fixed mistakes (thanks Alex Lancaster (alexl at users.sourceforge.net))

* Sat Nov 12 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-3
- Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))

* Sat Nov 12 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-2
- bump

* Sat Nov 12 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Dec 2005 22:14:12 -0000	1.1
+++ .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
@@ -0,0 +1 @@
+gDesklets-0.35.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Dec 2005 22:14:12 -0000	1.1
+++ sources	7 Dec 2005 22:14:49 -0000	1.2
@@ -0,0 +1 @@
+8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2




More information about the scm-commits mailing list