Hello community,
here is the log from the commit of package libnjb
checked in at Wed Apr 2 21:49:51 CEST 2008.
--------
--- libnjb/libnjb.changes 2008-02-01 11:57:40.000000000 +0100
+++ libnjb/libnjb.changes 2008-04-01 15:45:45.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 1 15:45:15 CEST 2008 - sbrabec@suse.cz
+
+- Merged SuSE FDI file with upstream one.
+- FDI rule adapted to new HAL (bnc#372557).
+
+-------------------------------------------------------------------
Old:
----
10-usb-music-players-libnjb.fdi
New:
----
libnjb-hal-fdi.patch
libnjb-hal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnjb.spec ++++++
--- /var/tmp/diff_new_pack.N32363/_old 2008-04-02 21:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.N32363/_new 2008-04-02 21:49:26.000000000 +0200
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: libnjb
BuildRequires: hal-devel libusb-devel
Url: http://libnjb.sourceforge.net
@@ -17,10 +18,11 @@
Group: Development/Libraries/Other
AutoReqProv: on
Version: 2.2.6
-Release: 1
+Release: 26
Summary: Nomad Jukebox API
Source: %{name}-%{version}.tar.gz
-Source1: 10-usb-music-players-libnjb.fdi
+Patch: %{name}-hal-fdi.patch
+Patch1: %{name}-hal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: dbus-1 hal libnjb5
@@ -47,6 +49,7 @@
Polar Humenn (playback hacks)
%package -n libnjb5
+License: BSD 3-Clause
Summary: Nomad Jukebox API
Group: Development/Libraries/Other
Requires: %{name} >= %{version}
@@ -74,6 +77,7 @@
Polar Humenn (playback hacks)
%package devel
+License: BSD 3-Clause
Group: Development/Libraries/Other
AutoReqProv: on
Summary: Nomad Jukebox API
@@ -104,6 +108,10 @@
%prep
%setup -q
+%patch
+%if %suse_version > 1030
+%patch1
+%endif
%build
autoreconf -fi
@@ -124,17 +132,15 @@
exit 1
fi
install -m 0755 -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/
- install -m 0644 %{S:1} $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
+ install -m 0644 libnjb.fdi $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n libnjb5
-/sbin/ldconfig
+%post -n libnjb5 -p /sbin/ldconfig
-%postun -n libnjb5
-/sbin/ldconfig
+%postun -n libnjb5 -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -154,12 +160,15 @@
%{_libdir}/pkgconfig/libnjb.pc
%changelog
+* Tue Apr 01 2008 sbrabec@suse.cz
+- Merged SuSE FDI file with upstream one.
+- FDI rule adapted to new HAL (bnc#372557).
* Fri Feb 01 2008 rodrigo@suse.de
- Update to version 2.2.6:
* Shape up udev rules so they look like the libsane stuff
* Add HAL FDI file
* Fixup libnjb udev rules to work with new udev and HAL
-* Wed Oct 03 2007 maw@suse.de
+* Thu Oct 04 2007 maw@suse.de
- Split out a libnjb5 subpackage.
* Wed May 16 2007 olh@suse.de
- Buildrequires libusb -> libusb-devel
++++++ libnjb-hal-fdi.patch ++++++
--- libnjb.fdi
+++ libnjb.fdi
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
+ <!-- USB devices that are music players but uses a user-space library -->
+
<match key="info.bus" string="usb">
+
+ <!-- Begin NJB devices (generated by njb-sharp for libnjb compatible devices) -->
+
+ <!-- Creative Nomad Jukebox -->
<match key="usb.vendor_id" int="0x0471">
<match key="usb.product_id" int="0x0222">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="oasis">
<append key="portable_audio_player.access_method.protocols" type="strlist">oasis</append>
@@ -23,12 +30,17 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox 2 -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4100">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
+
+ <!-- Creative Nomad Jukebox 3 -->
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -50,6 +62,7 @@
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -65,12 +78,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox 3</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox Zen -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4108">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -86,12 +102,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox Zen USB 2.0 -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x410b">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -107,12 +126,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen USB 2.0</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox Zen NX -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4109">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -128,12 +150,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen NX</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox Zen Xtra -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4110">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -149,12 +174,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen Xtra</merge>
</match>
</match>
+
+ <!-- Dell Digital Jukebox -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4111">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -170,12 +198,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Dell Digital Jukebox</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox Zen Touch -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x411b">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -191,12 +222,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen Touch</merge>
</match>
</match>
+
+ <!-- Creative Zen (Zen Micro variant) -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x411d">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -212,12 +246,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Zen</merge>
</match>
</match>
+
+ <!-- Creative Nomad Jukebox Zen Micro -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x411e">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -233,12 +270,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen Micro</merge>
</match>
</match>
+
+ <!-- Second Generation Dell Digital Jukebox -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4126">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -254,12 +294,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Dell Digital Jukebox (2nd Generation)</merge>
</match>
</match>
+
+ <!-- Dell Pocket DJ -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4127">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -275,12 +318,15 @@
<merge key="portable_audio_player.libnjb.name" type="string">Dell Pocket DJ</merge>
</match>
</match>
+
+ <!-- Creative Zen Sleek -->
<match key="usb.vendor_id" int="0x041e">
<match key="usb.product_id" int="0x4136">
<match key="info.capabilities" contains_not="portable_audio_player">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
</match>
<merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">njb</merge>
<merge key="portable_audio_player.access_method" type="string">user</merge>
<match key="portable_audio_player.access_method.protocols" contains_not="pde">
<append key="portable_audio_player.access_method.protocols" type="strlist">pde</append>
@@ -296,6 +342,9 @@
<merge key="portable_audio_player.libnjb.name" type="string">Creative Zen Sleek</merge>
</match>
</match>
+
+ <!-- End NJB devices -->
+
</match>
</device>
</deviceinfo>
++++++ libnjb-hal.patch ++++++
--- libnjb.fdi
+++ libnjb.fdi
@@ -3,7 +3,7 @@
<device>
<!-- USB devices that are music players but uses a user-space library -->
- <match key="info.bus" string="usb">
+ <match key="info.subsystem" string="usb">
<!-- Begin NJB devices (generated by njb-sharp for libnjb compatible devices) -->
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org