Hello community, here is the log from the commit of package usbmuxd for openSUSE:Factory checked in at 2014-07-17 06:57:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbmuxd (Old) and /work/SRC/openSUSE:Factory/.usbmuxd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbmuxd" Changes: -------- --- /work/SRC/openSUSE:Factory/usbmuxd/usbmuxd.changes 2013-11-29 07:05:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.usbmuxd.new/usbmuxd.changes 2014-07-17 06:58:07.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jul 15 05:50:07 UTC 2014 - i...@marguerite.su + +- added baselibs.conf to Source99 + +------------------------------------------------------------------- +Mon Jun 16 14:04:13 UTC 2014 - i...@marguerite.su + +- update version 1.0.9git20140528 + * remove libusbmuxd sources and adapt source tree to use autotools + * other bugfixes, see: + http://cgit.sukimashita.com/usbmuxd.git/log/ +- remove 0001-Add-support-for-automatic-activation-as-systemd-serv.patch + * upstream changed +- add usbmuxd systemd service + +------------------------------------------------------------------- Old: ---- 0001-Add-support-for-automatic-activation-as-systemd-serv.patch usbmuxd-1.0.8.tar.bz2 New: ---- usbmuxd-1.0.9git20140528.tar.bz2 usbmuxd.service.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbmuxd.spec ++++++ --- /var/tmp/diff_new_pack.SO4flY/_old 2014-07-17 06:58:08.000000000 +0200 +++ /var/tmp/diff_new_pack.SO4flY/_new 2014-07-17 06:58:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package usbmuxd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,27 +16,31 @@ # -%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d} - Name: usbmuxd -%define _libname libusbmuxd -Version: 1.0.8 +Version: 1.0.9git20140528 Release: 0 -Summary: Socket daemon for the usbmux protocol used by Apple devices -License: (GPL-2.0 or GPL-3.0) and LGPL-2.1+ +Summary: A socket daemon to multiplex connections from and to iOS devices +License: GPL-2.0 or GPL-3.0 Group: System/Libraries Url: http://cgit.sukimashita.com/usbmuxd.git/ -Source: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 -Patch0: 0001-Add-support-for-automatic-activation-as-systemd-serv.patch -BuildRequires: cmake +# To update libimobiledevice4 to support iOS 7, we need libusbmuxd +# which requires usbmuxd to be updated to git snapshot as well +#Source: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 +Source1: usbmuxd.service.in +Source99: baselibs.conf BuildRequires: gcc-c++ -BuildRequires: libplist-devel +BuildRequires: libimobiledevice-devel >= 1.0.6 +BuildRequires: libplist-devel >= 1.11 +BuildRequires: libtool BuildRequires: libusb-1_0-devel >= 1.0.3 BuildRequires: pkg-config BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) +Requires: libusbmuxd2 >= 1.0.9 Requires(pre): pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d} %{?systemd_requires} %description @@ -46,42 +50,26 @@ Usbmux is an encapsulation protocol (think IP, ATM, PPP) that allows multiplexing several conversations onto a single pair of wires. -%package -n %{_libname}2 - -Summary: A library to abstract socket/protocol communication to the usbmuxd daemon -Group: System/Libraries -Requires: %{name} -Provides: %{_libname} = %{version} -Obsoletes: %{_libname} < %{version} - -%description -n %{_libname}2 -This package contains the libusbmuxd library which provides an interface to -talk to the usbmux daemon, create connections and list attached devices. - -%package -n %{_libname}-devel - -Summary: Development files for %{_libname} -Group: Development/Libraries/C and C++ -Requires: %{_libname} = %{version} -Requires: glibc-devel - -%description -n %{_libname}-devel -The %{_libname}-devel package contains libraries and header files for -developing applications that use %{_libname}. - -%package -n iproxy -Summary: Proxy enabling TCP tunneling to iPhone/iPod Touch via USB cable -Group: System/Libraries -Requires: %{_libname} = %{version} +%prep +%setup -q +./autogen.sh -%description -n iproxy -Proxy enabling TCP tunneling to iPhone/iPod Touch via USB cable. +%build +%configure +make %{?_smp_mflags} -It allows you to map a port of a service running on the device (like sshd) and -redirect it to your local machine where you can interact with it. +%install +make install DESTDIR=%{buildroot} +# install systemd service +mkdir -p %{buildroot}%{_unitdir} +install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service +# fix udev rules +mkdir -p %{buildroot}%{_udevrulesdir} +mv %{buildroot}/lib/udev/rules.d/* %{buildroot}%{_udevrulesdir}/ +rm -rf %{buildroot}/lib %pre -getent passwd usbmux >/dev/null || useradd -r -g nogroup -d /var/lib/%{name} -s /sbin/nologin -c "%{name} daemon" usbmux +getent passwd usbmux >/dev/null || useradd -r -g nogroup -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "%{name} daemon" usbmux %service_add_pre usbmuxd.service exit 0 @@ -89,73 +77,19 @@ %service_del_preun usbmuxd.service %post -%{?udev_rules_update:%udev_rules_update} +%{?udev_rules_update:%{udev_rules_update}} %service_add_post usbmuxd.service +/sbin/ldconfig %postun %service_del_postun usbmuxd.service - -%prep -%setup -q -%patch0 -p1 -sed -i -e 's,/lib/udev/rules.d,%{_udevrulesdir},g' udev/CMakeLists.txt -%if 0%{?suse_version} >= 1230 -sed -i -e 's,/lib/systemd/system,%{_unitdir},g' udev/CMakeLists.txt -%endif - -%build -mkdir build -cd build -export CFLAGS="%{optflags} -fno-strict-aliasing" -cmake -DBUILD_STATIC_LIBS:BOOL=OFF -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -%if "%{_lib}" == "lib64" - -DLIB_SUFFIX:STRING=64 \ -%endif - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - -DBUILD_TESTING=OFF \ -%if %{undefined suse_version} - -DCMAKE_INSTALL_DO_STRIP=1 \ -%endif - -DWANT_SYSTEMD=ON \ - .. -make %{?_smp_mflags} - -%install -cd build -%{__make} install DESTDIR=%{buildroot} - -%clean -rm -rf %{buildroot} - -%post -n %{_libname}2 -p /sbin/ldconfig - -%postun -n %{_libname}2 -p /sbin/ldconfig +/sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README +%doc AUTHORS COPYING.GPLv2 COPYING.GPLv3 README %{_sbindir}/usbmuxd -%{_udevrulesdir}/85-usbmuxd.rules +%{_udevrulesdir}/39-usbmuxd.rules %{_unitdir}/usbmuxd.service -%files -n %{_libname}2 -%defattr(-,root,root) -%{_libdir}/libusbmuxd.so.* - -%files -n %{_libname}-devel -%defattr(-,root,root,-) -%doc README.devel -%{_includedir}/usbmuxd.h -%{_includedir}/usbmuxd-proto.h -%{_libdir}/%{_libname}.so -%{_libdir}/pkgconfig/%{_libname}.pc - -%files -n iproxy -%defattr(-,root,root) -%{_bindir}/iproxy - %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.SO4flY/_old 2014-07-17 06:58:08.000000000 +0200 +++ /var/tmp/diff_new_pack.SO4flY/_new 2014-07-17 06:58:08.000000000 +0200 @@ -1,2 +1 @@ usbmuxd -libusbmuxd2 ++++++ usbmuxd.service.in ++++++ [Unit] Description=Socket daemon for the usbmux protocol used by Apple devices [Service] Type=simple ExecStart=/usr/sbin/usbmuxd -u -U usbmux -f -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
