rpms/barry/devel .cvsignore, 1.6, 1.7 barry.spec, 1.20, 1.21 import.log, 1.2, 1.3 sources, 1.6, 1.7 barry.desktop, 1.4, NONE

Nathanael Noblet gnat at fedoraproject.org
Tue Mar 30 20:20:40 UTC 2010 

Author: gnat

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv451/devel

Modified Files:
	.cvsignore barry.spec import.log sources 
Removed Files:
	barry.desktop 
Log Message:
updated to git snapshot of 0.17 with udev, and desktop fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Jul 2009 23:59:31 -0000	1.6
+++ .cvsignore	30 Mar 2010 20:20:39 -0000	1.7
@@ -1,2 +1 @@
-barry-0.15-20090630.tar.bz2
-barrybackup24.png
+barry-0.17.tar.bz2


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- barry.spec	21 Jan 2010 19:05:42 -0000	1.20
+++ barry.spec	30 Mar 2010 20:20:39 -0000	1.21
@@ -6,8 +6,8 @@
 %endif
 
 Name:           barry
-Version:        0.15
-Release:        0.10.20090630git%{?dist}
+Version:        0.17
+Release:        0.1.20100329git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -20,9 +20,7 @@ URL:            http://www.netdirect.ca/
 # ./git-extract.sh 0 15 master
 # (cd build/barry* && ../../tar-prepare.sh)
 # (cd build && ../tar-create.sh 0 15)
-Source0:        %{name}-%{version}-20090630.tar.bz2
-Source1:        %{name}.desktop
-Source2:        barrybackup24.png
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
@@ -31,9 +29,9 @@ BuildRequires:  fuse-devel gettext-devel
 Requires:       initscripts
 
 %description
-Barry is a desktop toolset for managing your BlackBerry device.
+Barry is a desktop tool set for managing your BlackBerry device.
 
-This package contains commandline tools which will enable you to charge your
+This package contains command line tools which will enable you to charge your
 device with a proper 500mA and be able to access data on the device.  It also
 includes a GUI application to backup your BlackBerry.
 
@@ -114,8 +112,8 @@ cd ../
 %{__make} DESTDIR=%{buildroot} install
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/security/console.perms.d
-%{__cp} udev/fedora/10-blackberry.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
-%{__cp} udev/fedora/10-blackberry.perms %{buildroot}%{_sysconfdir}/security/console.perms.d/
+%{__cp} udev/10-blackberry.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+%{__cp} udev/69-blackberry.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/modprobe.d
 %{__cp} modprobe/blacklist-berry_charge.conf %{buildroot}%{_sysconfdir}/modprobe.d/
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/ppp/peers
@@ -126,18 +124,18 @@ cd ../
 %{__mkdir_p} %{buildroot}%{_datadir}/hal/fdi/information/10freedesktop
 %{__mkdir_p} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
 %{__cp} hal/fdi/information/10freedesktop/10-blackberry.fdi %{buildroot}%{_datadir}/hal/fdi/information/10freedesktop
-%{__cp} hal/fdi/policy/10osvendor/19-blackberry-acl.fdi %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
+#%{__cp} hal/fdi/policy/10osvendor/19-blackberry-acl.fdi %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
 # Install hal support script
 %{__mkdir_p} %{buildroot}%{_bindir}
 %{__cp} hal/hal-blackberry %{buildroot}%{_bindir}
+%find_lang %{name}
 
 # gui tree
 cd gui/
 %{__make} DESTDIR=%{buildroot} install
-desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1}
-%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps
-
-install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/barrybackup.png
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications/ ../menu/barrybackup.desktop
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -p -m 0644 ../logo/barry_logo_icon.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 cd ../
 
 # opensync tree
@@ -151,17 +149,17 @@ cd ../
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
 %{__rm} -rf %{buildroot}%{_libdir}/*.a
 
-%files
+%files -f %{name}.lang 
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/hal/fdi/information/10freedesktop/10-blackberry.fdi
-%{_datadir}/hal/fdi/policy/10osvendor/19-blackberry-acl.fdi
+#%{_datadir}/hal/fdi/policy/10osvendor/19-blackberry-acl.fdi
 %{_datadir}/barry/glade/*.glade
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/barrybackup*.png
-
+%{_datadir}/applications/barrybackup.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/locale/fr/LC_MESSAGES/barry-backup.mo
 %config(noreplace) %{_sysconfdir}/ppp/peers/*
 %config(noreplace) %{_sysconfdir}/chatscripts/*.chat
 
@@ -169,7 +167,7 @@ cd ../
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
-%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+#%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-berry_charge.conf
 %doc AUTHORS ChangeLog COPYING NEWS README
 
@@ -212,6 +210,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 29 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.1.20100329git
+- Update version to include new udev rules fixing permission issue on f12
+- Fix icon and .desktop file installation
+- rpmlint spelling errors fixed
+
 * Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.1.5-0.10.200963git
 - Rebuild for Boost soname bump
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Nov 2008 23:23:20 -0000	1.2
+++ import.log	30 Mar 2010 20:20:40 -0000	1.3
@@ -1,2 +1,3 @@
 barry-0_14-4_fc10:HEAD:barry-0.14-4.fc10.src.rpm:1226519852
 barry-0_14-5_fc10:HEAD:barry-0.14-5.fc10.src.rpm:1226532123
+barry-0_17-0_1_20100329git_fc12:HEAD:barry-0.17-0.1.20100329git.fc12.src.rpm:1269980332


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	1 Jul 2009 23:59:31 -0000	1.6
+++ sources	30 Mar 2010 20:20:40 -0000	1.7
@@ -1,2 +1 @@
-cb0d31464cd7aae28a344c68cbe97a49  barry-0.15-20090630.tar.bz2
-3c4691c06276ec61d3a28f0d65cb3a43  barrybackup24.png
+00868fe0d3be7dce983462da046ada3c  barry-0.17.tar.bz2


--- barry.desktop DELETED ---

More information about the scm-commits mailing list