rpms/barry/devel .cvsignore, 1.4, 1.5 barry.desktop, 1.2, 1.3 barry.spec, 1.15, 1.16 sources, 1.4, 1.5

[Christopher D. Stover]

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22341/devel

Modified Files:
	.cvsignore barry.desktop barry.spec sources 
Log Message:
Update to new git.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Jun 2009 22:03:26 -0000	1.4
+++ .cvsignore	30 Jun 2009 23:07:25 -0000	1.5
@@ -1 +1 @@
-barry-0.15-20090623.tar.bz2
+barry-0.15-20090630.tar.bz2


Index: barry.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- barry.desktop	24 Jun 2009 22:03:26 -0000	1.2
+++ barry.desktop	30 Jun 2009 23:07:25 -0000	1.3
@@ -3,7 +3,6 @@
 Encoding=UTF-8
 Name=Barry Backup
 GenericName=utility
-NoDisplay=true
 Comment=Backup your Blackberry
 Exec=barrybackup
 Icon=backup


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- barry.spec	24 Jun 2009 22:03:26 -0000	1.15
+++ barry.spec	30 Jun 2009 23:07:25 -0000	1.16
@@ -1,13 +1,21 @@
-# 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
+# Fedora <= 8 & ==11 currently supports opensync 0.22
+#%define with_opensync 0
+#%if %{?fedora} < 9
+#    %define with_opensync 1
 #%endif
+#%if %{?fedora} > 10
+#    %define with_opensync 1
+#%endif
+
+%if 0%{?fc9}%{?fc10}
+     %define with_opensync 0
+%else
+     %define with_opensync 1
+%endif
 
 Name:           barry
 Version:        0.15
-Release:        0.6.20090623git%{?dist}
+Release:        0.7.20090630git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -20,7 +28,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}-20090623.tar.bz2
+Source0:        %{name}-%{version}-20090630.tar.bz2
 Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,73 +46,51 @@ includes a GUI application to backup you
 
 
 %package libs
-Summary: BlackBerry Desktop for Linux - barry libraries
+Summary: BlackBerry Desktop for Linux - libraries
 Group: System Environment/Libraries
 Requires: udev pam module-init-tools
 
 %description libs
-Barry is a desktop toolset for managing your BlackBerry device.
-
-This package contains the library files, license agreement, README file,
-and most other assorted documentation common to all sub-packages.
-
+This package contains the library files, license agreement and README file.
 
 %package devel
-Summary: BlackBerry Desktop for Linux - barry development libraries
+Summary: BlackBerry Desktop for Linux - development libraries
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: libusb-devel boost-devel pkgconfig
 
 %description devel
-Barry is a desktop toolset for managing your BlackBerry device.
-
 This package contains the development library files for Barry, barry-libs.
 
+%package devel-docs
+Summary: BlackBerry Desktop for Linux - development libraries documentation
+Group: Development/Libraries
+BuildArch: noarch
+
+%description devel-docs
+This package contains the documentation for the development library files for
+Barry.
 
 %if %{with_opensync}
 %package opensync
 Summary: BlackBerry Desktop for Linux - opensync plugin
 Group: Applications/Productivity
 BuildRequires: libopensync-devel
-Requires: libopensync = 0.22
+Requires: libopensync = 1:0.22
 
 %description opensync
-Barry is a desktop toolset for managing your BlackBerry device.
-
-This package contains the opensync plugin.
+This package contains the opensync plugin to synchronize your BlackBerry.
 %endif
 
 %prep
 %setup -q
 %{__rm} -rf ./doc/www/*.php
 %{__rm} -rf ./doc/www/*.sh
-%{__rm} -rf ./doc/www/doxygen/html/scoped__lock_8h__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__inherit__graph.map
-%{__rm} -rf ./doc/www/doxygen/html/dataqueue_8h__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__coll__graph.map
-%{__rm} -rf ./doc/www/doxygen/html/protostructs_8h__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1DBPacket__inherit__graph.map
-%{__rm} -rf ./doc/www/doxygen/html/bcharge_8cc__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/bidentify_8cc__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/packet_8h__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/strnlen_8h__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/bs11nread_8cc__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/bfuse_8cc__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/btool_8cc__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/pppob_8cc__incl.map
-%{__rm} -rf ./doc/www/doxygen/html/upldif_8cc__incl.map
-%{__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
-%{__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
+find ./doc/www/doxygen/html -type f -size 0 -name \*.map -exec rm '{}' \;
 
 %build
 # main tree
-%{configure} --with-boost --with-zlib
+%{configure} --enable-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}
@@ -115,9 +101,9 @@ cd gui/
 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
 # Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
-touch -r Makefile ./src/Makefile ./src/Makefile.am ./src/Makefile.in \
-  ./man/Makefile.am ./man/Makefile.in config.h config.h.in Makefile.am \
-  Makefile.in configure.ac aclocal.m4 configure
+#touch -r Makefile ./src/Makefile ./src/Makefile.am ./src/Makefile.in \
+#  ./man/Makefile.am ./man/Makefile.in config.h config.h.in Makefile.am \
+#  Makefile.in configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 cd ../
 
@@ -147,7 +133,9 @@ cd ../
 %{__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
+%{__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}
@@ -165,6 +153,7 @@ cd opensync-plugin/
 cd ../
 %endif
 
+%{__rm} -rf %{buildroot}%{_libdir}/opensync/plugins/*.la
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
 %{__rm} -rf %{buildroot}%{_libdir}/*.a
 
@@ -173,12 +162,13 @@ cd ../
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man1/*
-%{_datadir}/barry/
 %{_datadir}/hal/fdi/information/10freedesktop/10-blackberry.fdi
+%{_datadir}/hal/fdi/policy/10osvendor/19-blackberry-acl.fdi
+%{_datadir}/barry/glade/*.glade
 %{_datadir}/applications/%{name}.desktop
 
 %config(noreplace) %{_sysconfdir}/ppp/peers/*
-%config(noreplace) %{_sysconfdir}/chatscripts/
+%config(noreplace) %{_sysconfdir}/chatscripts/*.chat
 
 %files libs
 %defattr(-,root,root)
@@ -190,17 +180,21 @@ cd ../
 
 %files devel
 %defattr(-,root,root)
-%doc examples/*.cc examples/*.am
 %{_includedir}/barry/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%doc TODO doc/*
+%doc COPYING TODO examples/*.cc examples/*.am
+
+%files devel-docs
+%defattr(-,root,root)
+%doc COPYING doc/*
 
 %if %{with_opensync}
 %files opensync
 %defattr(-,root,root)
 %{_libdir}/opensync/plugins/*
 %{_datadir}/opensync/defaults/*
+%doc COPYING
 %endif
 
 %clean
@@ -211,6 +205,12 @@ cd ../
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 30 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.7.20090630git
+- version/git bump
+- create separate doc package; BZ#508462
+- fixed the opensync build issue; BZ#506609
+- incorporated hal changes; BZ#478851
+
 * Wed Jun 23 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.6.20090623git
 - version/git bump
 - added configure --with-zlib


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Jun 2009 22:03:27 -0000	1.4
+++ sources	30 Jun 2009 23:07:25 -0000	1.5
@@ -1 +1 @@
-b9bedfe7d8dfd3947bbb4bc7994c7146  barry-0.15-20090623.tar.bz2
+cb0d31464cd7aae28a344c68cbe97a49  barry-0.15-20090630.tar.bz2