[barry/f16] new upstream release, various minor specfile cleanups

[Nathanael Noblet]

commit e1cb54bc1bf984b405654a848ad497e2d22b3d9c
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jun 6 10:36:17 2012 -0600

    new upstream release, various minor specfile cleanups

 .gitignore |    2 ++
 barry.spec |   25 +++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c3d888..4c580e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ barry-0.17.tar.bz2
 /barry-20110126.0.17.tar.bz2
 /barry-0.17.0.tar.bz2
 /barry-0.17.1.tar.bz2
+/barry-0.18.0.tar.bz2
+/barry-0.18.3.tar.bz2
diff --git a/barry.spec b/barry.spec
index 11919db..02ca5aa 100644
--- a/barry.spec
+++ b/barry.spec
@@ -1,5 +1,5 @@
 Name:           barry
-Version:        0.18.0
+Version:        0.18.3
 Release:        1%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
@@ -67,6 +67,7 @@ This package contains the opensync plugin to synchronize your BlackBerry.
 %setup -q
 %{__rm} -rf ./doc/www/*.php
 %{__rm} -rf ./doc/www/*.sh
+#find ./doc/www/doxygen/html -type f -size 0 -name \*.map -exec rm '{}' \;
 
 %build
 # main tree
@@ -97,21 +98,27 @@ cd ../
 %install
 # main tree
 %{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d
-%{__mkdir_p} %{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}%{_prefix}/lib/udev/rules.d
+%{__cp} udev/69-blackberry.rules udev/10-blackberry.rules %{buildroot}%{_prefix}/lib/udev/rules.d/
+
+#%{__mkdir_p} %{buildroot}%{_sysconfdir}/security/console.perms.d
+
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/modprobe.d
 %{__cp} modprobe/blacklist-berry_charge.conf %{buildroot}%{_sysconfdir}/modprobe.d/
+
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/ppp/peers
 %{__cp} ppp/barry-* %{buildroot}%{_sysconfdir}/ppp/peers/
+
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/chatscripts
 %{__cp} ppp/barry-*.chat %{buildroot}%{_sysconfdir}/chatscripts/
+
 # Install hal fdi config
 %{__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
+
 # Install hal support script
 %{__mkdir_p} %{buildroot}%{_bindir}
 %{__cp} hal/hal-blackberry %{buildroot}%{_bindir}
@@ -151,7 +158,7 @@ cd ../
 %files libs
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+%{_prefix}/lib/udev/rules.d/*
 #%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-berry_charge.conf
 %doc AUTHORS ChangeLog COPYING NEWS README
@@ -191,6 +198,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %postun libs -p /sbin/ldconfig
 
 %changelog
+-* Wed Jun 6 2012 Nathanael Noblet <nathanael at gnat.ca> - 0.18.3-1
+- remove udev requires
+- moved udev rules to system directory
+- removed un-needed security directory
+- New upstream release
+
 * Wed May 2 2012 Nathanael Noblet <nathanael at gnat.ca> - 0.18.0-1
 - New upstream release
 
diff --git a/sources b/sources
index 78b643f..d2124a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fad0ba30dcd40aa3ded9334c986e7ec  barry-0.18.0.tar.bz2
+1a3077256efd449ec59fa9309aa28b81  barry-0.18.3.tar.bz2