rpms/barry/F-11 .cvsignore, 1.3, 1.4 barry.desktop, 1.1, 1.2 barry.spec, 1.14, 1.15 sources, 1.3, 1.4

[Christopher D. Stover]

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29336

Modified Files:
	.cvsignore barry.desktop barry.spec sources 
Log Message:
New snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jan 2009 18:03:33 -0000	1.3
+++ .cvsignore	23 Jun 2009 23:57:26 -0000	1.4
@@ -1 +1 @@
-barry-0.15-20090109.tar.bz2
+barry-0.15-20090623.tar.bz2


Index: barry.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-11/barry.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- barry.desktop	12 Nov 2008 20:01:28 -0000	1.1
+++ barry.desktop	23 Jun 2009 23:57:26 -0000	1.2
@@ -1,8 +1,9 @@
 
 [Desktop Entry]
 Encoding=UTF-8
-Name=backup
+Name=Barry Backup
 GenericName=utility
+NoDisplay=true
 Comment=Backup your Blackberry
 Exec=barrybackup
 Icon=backup


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-11/barry.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- barry.spec	3 Mar 2009 10:42:25 -0000	1.14
+++ barry.spec	23 Jun 2009 23:57:26 -0000	1.15
@@ -1,12 +1,13 @@
-# Fedora 9/10/11 don't support opensync 0.22
+# Fedora currently supports opensync 0.22
+# However, I'm leaving this in case it changes.
 %define with_opensync 1
-%if %{?fedora} > 8
-    %define with_opensync 0
-%endif
+#%if %{?fedora} > 8
+#    %define with_opensync 0
+#%endif
 
 Name:           barry
 Version:        0.15
-Release:        0.5.20090109git%{?dist}
+Release:        0.1.20090623git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -19,17 +20,13 @@ 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}-20090109.tar.bz2
+Source0:        %{name}-%{version}-20090623.tar.bz2
 Source1:        %{name}.desktop
-# ip_modem password patch for the Blackberry Bold 9000
-# http://sourceforge.net/mailarchive/forum.php?thread_name=4968F513.1050909%40comcast.net&forum_name=barry-devel
-Patch0:         barry-ipmodem.patch
-Patch1:         barry-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
 BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
-BuildRequires:  fuse-devel
+BuildRequires:  fuse-devel gettext-devel doxygen autoconf zlib-devel
 Requires:       initscripts
 
 %description
@@ -69,7 +66,7 @@ This package contains the development li
 Summary: BlackBerry Desktop for Linux - opensync plugin
 Group: Applications/Productivity
 BuildRequires: libopensync-devel
-Requires: libopensync == 0.22
+Requires: libopensync = 0.22
 
 %description opensync
 Barry is a desktop toolset for managing your BlackBerry device.
@@ -99,13 +96,15 @@ This package contains the opensync plugi
 %{__rm} -rf ./doc/www/doxygen/html/brecsum_8cc__incl.map
 %{__rm} -rf ./doc/www/doxygen/html/breset_8cc__incl.map
 %{__rm} -rf ./doc/www/doxygen/html/endian_8h__incl.map
-%patch0 -p1
-%patch1 -p1
-
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1JLPacket__coll__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/brimtrans_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1JLPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1DataQueue__coll__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/bjavaloader_8cc__incl.map
 
 %build
 # main tree
-%{configure} --with-boost
+%{configure} --with-boost --with-zlib
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
@@ -128,6 +127,7 @@ cd opensync-plugin/
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%{__make} %{?_smp_mflags}
 cd ../
 %endif
 
@@ -136,15 +136,21 @@ cd ../
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d
-%{__cp} udev/10-blackberry.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/security/console.perms.d
-%{__cp} udev/10-blackberry.perms %{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/
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/modprobe.d
-%{__cp} modprobe/blacklist-berry_charge %{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
+%{__cp} hal/10-blackberry.fdi %{buildroot}%{_datadir}/hal/fdi/information/10freedesktop
+# Install hal support script
+%{__mkdir_p} %{buildroot}%{_bindir}
+%{__cp} hal/hal-blackberry %{buildroot}%{_bindir}
 
 # gui tree
 cd gui/
@@ -166,9 +172,11 @@ cd ../
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/barry/
+%{_datadir}/hal/fdi/information/10freedesktop/10-blackberry.fdi
 %{_datadir}/applications/%{name}.desktop
-%{_mandir}/man1/*
+
 %config(noreplace) %{_sysconfdir}/ppp/peers/*
 %config(noreplace) %{_sysconfdir}/chatscripts/
 
@@ -177,7 +185,7 @@ cd ../
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*
-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-berry_charge
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-berry_charge.conf
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %files devel
@@ -203,6 +211,10 @@ cd ../
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 23 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.1.20090623git
+- version/git bump
+- added configure --with-zlib
+
 * Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 0.15-0.5.20090109git
 - include stdio.h for EOF
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jan 2009 18:03:33 -0000	1.3
+++ sources	23 Jun 2009 23:57:26 -0000	1.4
@@ -1 +1 @@
-03f78f7a136eae0ca0b7310354a35afd  barry-0.15-20090109.tar.bz2
+b9bedfe7d8dfd3947bbb4bc7994c7146  barry-0.15-20090623.tar.bz2