diff --git a/.cvsignore b/.cvsignore index 8328ffb..0a312aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -barry-0.15-20090630.tar.bz2 -barrybackup24.png +barry-0.17.tar.bz2 diff --git a/barry.desktop b/barry.desktop deleted file mode 100644 index 2663b8a..0000000 --- a/barry.desktop +++ /dev/null @@ -1,12 +0,0 @@ - -[Desktop Entry] -Encoding=UTF-8 -Name=Barry Backup -GenericName=utility -Comment=Backup your Blackberry -Exec=barrybackup -Icon=barrybackup -Terminal=false -Type=Application -Categories=Utility; -X-Desktop-File-Install-Version=0.15 diff --git a/barry.spec b/barry.spec index e28580d..bf80ba4 100644 --- a/barry.spec +++ b/barry.spec @@ -6,8 +6,8 @@ %endif Name: barry -Version: 0.15 -Release: 0.9.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/downloads/barry # ./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 doxygen autoconf zlib-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,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %postun libs -p /sbin/ldconfig %changelog +* Mon Mar 29 2010 Nathanael Noblet - 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 - 0.1.5-0.10.200963git +- Rebuild for Boost soname bump + * Thu Sep 17 2009 Peter Lemenkov - 0.15-0.9.20090630git - Rebuilt with new fuse diff --git a/import.log b/import.log index d8154e3..800b902 100644 --- a/import.log +++ b/import.log @@ -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:F-12:barry-0.17-0.1.20100329git.fc12.src.rpm:1269981331 diff --git a/sources b/sources index 7be16e4..3de9055 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -cb0d31464cd7aae28a344c68cbe97a49 barry-0.15-20090630.tar.bz2 -3c4691c06276ec61d3a28f0d65cb3a43 barrybackup24.png +00868fe0d3be7dce983462da046ada3c barry-0.17.tar.bz2