rpms/blueproximity/devel blueproximity-fedorization.diff, NONE, 1.1 blueproximity-fix-bash-script.diff, NONE, 1.1 blueproximity.desktop, NONE, 1.1 blueproximity.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jonathan Steffan]

Author: jsteffan

Update of /cvs/extras/rpms/blueproximity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23977/devel

Modified Files:
	.cvsignore sources 
Added Files:
	blueproximity-fedorization.diff 
	blueproximity-fix-bash-script.diff blueproximity.desktop 
	blueproximity.spec import.log 
Log Message:
Import from review.


blueproximity-fedorization.diff:

--- NEW FILE blueproximity-fedorization.diff ---
--- proximity.py	2008-02-14 12:57:16.000000000 -0200
+++ blueproximity-1.py	2008-02-14 23:00:14.000000000 -0200
@@ -25,8 +25,8 @@
 ## This value gives us the base directory for language files and icons.
 # Set this value to './' for svn version
 # or to '/usr/share/blueproximity/' for packaged version
-dist_path = './' 
-
+dist_path = '/usr/share/blueproximity/' 
+pixmaps_path = 'pixmaps/'
 
 # system includes
 import os
@@ -42,7 +42,7 @@
 import gettext
 
 #Get the local directory since we are not installing anything
-local_path = dist_path + 'LANG/'
+local_path = '/usr/share/locale/'
 # Init the list of languages to support
 langs = []
 #Check the default locale
@@ -81,8 +81,8 @@
 except:
     print _("The program cannot import the module gobject.")
     print _("Please make sure the GObject bindings for python are installed.")
-    print _("e.g. with Ubuntu Linux, type")
-    print _(" sudo apt-get install python-gobject")
+    print _("e.g. with Fedora, type as root")
+    print _("yum install pygobject2")
     sys.exit(1)
 try:
     from configobj import ConfigObj
@@ -90,8 +90,8 @@
 except:
     print _("The program cannot import the module ConfigObj or Validator.")
     print _("Please make sure the ConfigObject package for python is installed.")
-    print _("e.g. with Ubuntu Linux, type")
-    print _(" sudo apt-get install python-configobj")
+    print _("e.g. with Fedora, type as root")
+    print _("yum install python-configobj")
     sys.exit(1)
 IMPORT_BT=0
 try:
@@ -112,8 +112,8 @@
 if (IMPORT_BT!=2):
     print _("The program cannot import the module bluetooth.")
     print _("Please make sure the bluetooth bindings for python as well as bluez are installed.")
-    print _("e.g. with Ubuntu Linux, type")
-    print _(" sudo apt-get install python-bluez")
+    print _("e.g. with Fedora, type as root")
+    print _("yum install pybluez")
     sys.exit(1)
 try:
     import pygtk
@@ -122,16 +122,16 @@
 except:
     print _("The program cannot import the module pygtk.")
     print _("Please make sure the GTK2 bindings for python are installed.")
-    print _("e.g. with Ubuntu Linux, type")
-    print _(" sudo apt-get install python-gtk2")
+    print _("e.g. with Fedora, type as root")
+    print _("yum install pygtk2")
     sys.exit(1)
 try:
     import gtk.glade
 except:
     print _("The program cannot import the module glade.")
     print _("Please make sure the Glade2 bindings for python are installed.")
-    print _("e.g. with Ubuntu Linux, type")
-    print _(" sudo apt-get install python-glade2")
+    print _("e.g. with Fedora, type as root")
+    print _("yum install install pygtk2-libglade")
     sys.exit(1)
 
 
@@ -157,15 +157,15 @@
     
 
 ## The icon used at normal operation and in the info dialog.
-icon_base = 'blueproximity_base.svg'
+icon_base = pixmaps_path + 'blueproximity_base.svg'
 ## The icon used at distances greater than the unlock distance.
-icon_att = 'blueproximity_attention.svg'
+icon_att = pixmaps_path + 'blueproximity_attention.svg'
 ## The icon used if no proximity is detected.
-icon_away = 'blueproximity_nocon.svg'
+icon_away = pixmaps_path  + 'blueproximity_nocon.svg'
 ## The icon used during connection processes and with connection errors.
-icon_con = 'blueproximity_error.svg'
+icon_con = pixmaps_path + 'blueproximity_error.svg'
 ## The icon shown if we are in pause mode.
-icon_pause = 'blueproximity_pause.svg'
+icon_pause = pixmaps_path + 'blueproximity_pause.svg'
 
 
 ## This class represents the main configuration window and

blueproximity-fix-bash-script.diff:

--- NEW FILE blueproximity-fix-bash-script.diff ---
--- start_proximity.sh	2008-02-10 20:42:31.000000000 -0200
+++ script	2008-02-14 19:36:08.000000000 -0200
@@ -1,5 +1,5 @@
 #!/bin/bash
 PRG="$0"
-P=`dirname $PRG`
+P="/usr/share/blueproximity/"
 cd $P
 python proximity.py


--- NEW FILE blueproximity.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BlueProximity
GenericName=BlueProximity
Comment=Leave it - it's locked, come back - it's back too...
Exec=blueproximity
Icon=blueproximity_base
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE blueproximity.spec ---
Name:		blueproximity
Version:	1.2.5
Release:	4%{?dist}
Summary:	Detects you via your bluetooth devices and locks/unlocks the screen
BuildArch:	noarch
Group:		Applications/Communications
License:	GPL+
URL:		http://blueproximity.sourceforge.net/
Source0:	http://downloads.sourceforge.net/blueproximity/%{name}-%{version}.tar.gz
Source1:	%{name}.desktop
Patch0:		blueproximity-fedorization.diff
Patch1:		blueproximity-fix-bash-script.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	desktop-file-utils, gettext
Requires:	python-configobj, pybluez, pygtk2-libglade

%description
Add security to your desktop by automatically locking and unlocking 
the screen when you and your phone leave/enter the desk. Think of a 
proximity detector for your mobile phone via bluetooth.

%prep
%setup -q -n %{name}-%{version}.orig
%patch0 -p0 -b .fedorization
%patch1 -p0 -b .fix-bash-script

%build

%install
rm -rf %{buildroot}

# Create Directory Structure
install -d %{buildroot}%{_datadir}/%{name}/
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/pixmaps/
install -d %{buildroot}%{_datadir}/%{name}/pixmaps/
install -d %{buildroot}%{_mandir}/man1/

# Install Files
install -p -m 0755 start_proximity.sh %{buildroot}%{_bindir}/%{name}
install -p -m 0755 proximity.py %{buildroot}%{_datadir}/%{name}/
install -p -m 0644 proximity.glade %{buildroot}%{_datadir}/%{name}/
install -p -m 0644 doc/blueproximity.1 %{buildroot}%{_mandir}/man1/

# Install Languages
for i in $(ls LANG/); do
install -d %{buildroot}%{_datadir}/locale/$i/LC_MESSAGES/
install -p -m 0644 LANG/$i/LC_MESSAGES/* %{buildroot}%{_datadir}/locale/$i/LC_MESSAGES/
done

# Install Images
for i in $(ls *.svg); do
install -p -m 0644 $i %{buildroot}%{_datadir}/%{name}/pixmaps/
done

# Link in SVG
pushd %{buildroot}%{_datadir}
ln -s ../%{name}/pixmaps/%{name}_base.svg pixmaps/
popd

# Install Menu Item
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}

# Find Languages
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README doc/manual*
%{_datadir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/blueproximity*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}_base.svg

%changelog
* Fri Jun 19 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 1.2.5-4
- Install man page, rather then shipping in documentation

* Thu Jun 18 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 1.2.5-3
- Update spec with changes from review
- Clean up spec and add comments

* Fri May 29 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 1.2.5-2
- Re-submit for inclusion in Fedora

* Thu Oct 30 2008 Patrick Steiner <patrick.steiner at a1.net> - 1.2.5-1
- Update to 1.2.5

* Tue Mar 11 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-6
- Fixed symlink of blueproximity_base
- Removed unnecesary install -d of locale dir.

* Tue Feb 26 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-5
- Fixed duplicate of blueproximity_base.svg
- Fixed some unnecesary "install -d"'s and "mkdir"'s

* Mon Feb 18 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-4
- Fixed Description Line (too long)
- Corrected mixed use of spaces and tabs

* Sun Feb 17 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-3
- Fixed Description Line (too long)
- Fixed Spec file name
- Fixed several macros in changelog
- Added empty build section
- Corrected mixed use of spaces and tabs
- Removed extra dependencies: pygtk2-libglade require pygtk2 which require pygobject2
- Fixed .desktop icon name
- Added copy of icon
- Changed .desktop filename to fedora-%%{name}.desktop

* Sun Feb 17 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-2
- Fixed Version:
- Fixed %%setup (added -q, added -n because of upstream directory)
- Fixed Source0 to upstream URL

* Sat Feb 16 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-1
- The licence field isn't correct. Corrected to GPLv2
- the upstream isn't used. Fixed %%version to work, changed Source0 to upstream version downloaded from sf.net
- gettext is only a BuildRequire. Fixed, removed from Require:
- /usr/share/blueproximity/proximity.glade is executable. Changed permissions to 0644
- name of the icon on the .desktop isn't correct. Changed to %%{name}.desktop

* Thu Feb 14 2008 Nicolas Corrarello <ncorrare at redhat.com> - 1.2.4-1
- Initial Fedora build


--- NEW FILE import.log ---
blueproximity-1_2_5-4_fc9:HEAD:blueproximity-1.2.5-4.fc9.src.rpm:1245527774


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blueproximity/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Jun 2009 15:07:51 -0000	1.1
+++ .cvsignore	20 Jun 2009 19:56:48 -0000	1.2
@@ -0,0 +1 @@
+blueproximity-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blueproximity/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Jun 2009 15:07:51 -0000	1.1
+++ sources	20 Jun 2009 19:56:48 -0000	1.2
@@ -0,0 +1 @@
+5fa33a73869d1b6f40957bdba3da636b  blueproximity-1.2.5.tar.gz