Changes - j0ke.net Open Build Service

Changes of Revision 19

[-] [+]	Changed	mISDNuser-SLE_11.spec
@@ -1,39 +1,40 @@ -# -# spec file for package mISDNuser (Version 1.1.21) -# -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# +# +# spec file for package mISDNuser (Version 2.0.1) +# +# Copyright (c) 2009 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 -# upon. The license for this file, and modifications and additions to the +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ -# +# # norootforbuild Name: mISDNuser -#BuildRequires: -Url: www.misdn.org -License: GPL v2 only; LGPL v2.1 only +Url: http://www.misdn.org +License: GPL v2 only ; LGPL v2.1 only BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on +BuildRequires: gcc-c++ glibc-devel libqt4-devel Group: Hardware/ISDN Summary: Tools and library for mISDN -Version: 1.1.21 +Version: 2.0.1 Release: 1 Source0: %{name}-%{version}.tar.bz2 ExcludeArch: s390 s390x + %description This package contains libmisdn and some tools to use the mISDN driver. -mISDN is the new modular ISDN driver for Linux. +mISDN is the new modular ISDN driver for Linux. @@ -42,13 +43,14 @@ Karsten Keil <kkeil@novell.com> Andreas Eversberg <jolly@eversberg.eu> Christian Richter <christian.richter@beronet.com> - Martin Bachem <m.bachem@gmx.de> - Matthias Urlichs <smurf@smurf.noris.de> - and more ... + Martin Bachem <m.bachem@gmx.de> + Matthias Urlichs <smurf@smurf.noris.de> + and more ... %package devel -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Requires: %{name} = %{version} +Requires: glibc-devel Summary: C header files for mISDN Group: Development/Libraries/C and C++ @@ -67,31 +69,79 @@ Matthias Urlichs <smurf@smurf.noris.de> and more ... + +%package gui +License: GPL v2 only ; LGPL v2.1 only +Summary: Qt application to watch the status of mISDN cards +Group: System/X11/Utilities + +%description gui +This subpackage contain a little Qt tool for watching the status of +ISDN cards. + %prep -%setup -q -n mISDNuser +%setup -q %build -export SUSE_ASNEEDED=0 -make EXTRA_CFLAGS="$RPM_OPT_FLAGS" +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +#export SUSE_ASNEEDED=0 + +aclocal +libtoolize --force --automake --copy +automake --add-missing --copy +autoconf + +export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS" + +%configure --enable-gui --enable-example %install -make INSTALL_PREFIX=$RPM_BUILD_ROOT INSTALL_LIBDIR=%{_libdir}/ install +DESTDIR=${RPM_BUILD_ROOT} make install + +%post +ldconfig + +%postun +ldconfig %files %defattr(-,root,root) -#%doc -/usr/bin/* -%{_libdir}/libmisdn.so +%doc NEWS ChangeLog README INSTALL +/usr/bin/l1oipctrl +/usr/bin/misdn_bridge +/usr/bin/misdn_info +/usr/bin/misdn_log +/usr/bin/misdnportinfo +/usr/bin/misdntestcon +/usr/bin/misdntestlayer1 +/usr/bin/misdntestlayer3 + +/usr/sbin/* + +%{_libdir}/libmisdn.so.0 +%{_libdir}/libmisdn.so.0.2.1 +%{_libdir}/libsuppserv.so.0 +%{_libdir}/libsuppserv.so.0.1.1 %files devel %defattr(-,root,root) -%dir /usr/include/mISDNuser -%attr (0644, root, root) /usr/include/mISDNuser/.h -%attr (0644, root, root) %{_libdir}/libmisdn.a +%dir /usr/include/mISDN +%attr (0644, root, root) /usr/include/mISDN/.h +%attr (0644, root, root) %{_libdir}/libmisdn.a +%attr (0644, root, root) %{_libdir}/libmisdn.la +%attr (0644, root, root) %{_libdir}/libmisdn.so +%attr (0644, root, root) %{_libdir}/libsuppserv.so +%attr (0644, root, root) %{_libdir}/libsuppserv.a +%attr (0644, root, root) %{_libdir}/libsuppserv.la -%changelog - Thu Mar 18 2010 Carsten Schoene <cs@linux-administrator.com> - 1.1.21-1 -- update to release 1.1.21 +%files gui +%defattr(-,root,root) +/usr/bin/qmisdnwatch +%changelog +* Fri Jun 19 2009 coolo@novell.com +- disable as-needed for this package as it fails to build with it * Mon Sep 1 2008 kkeil@suse.de - first version
[-] [+]	Changed	mISDNuser-SLE_11_SP1.spec ^
@@ -1,39 +1,40 @@ -# -# spec file for package mISDNuser (Version 1.1.21) -# -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# +# +# spec file for package mISDNuser (Version 2.0.1) +# +# Copyright (c) 2009 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 -# upon. The license for this file, and modifications and additions to the +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ -# +# # norootforbuild Name: mISDNuser -#BuildRequires: -Url: www.misdn.org -License: GPL v2 only; LGPL v2.1 only +Url: http://www.misdn.org +License: GPL v2 only ; LGPL v2.1 only BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on +BuildRequires: gcc-c++ glibc-devel libqt4-devel Group: Hardware/ISDN Summary: Tools and library for mISDN -Version: 1.1.21 +Version: 2.0.1 Release: 1 Source0: %{name}-%{version}.tar.bz2 ExcludeArch: s390 s390x + %description This package contains libmisdn and some tools to use the mISDN driver. -mISDN is the new modular ISDN driver for Linux. +mISDN is the new modular ISDN driver for Linux. @@ -42,13 +43,14 @@ Karsten Keil <kkeil@novell.com> Andreas Eversberg <jolly@eversberg.eu> Christian Richter <christian.richter@beronet.com> - Martin Bachem <m.bachem@gmx.de> - Matthias Urlichs <smurf@smurf.noris.de> - and more ... + Martin Bachem <m.bachem@gmx.de> + Matthias Urlichs <smurf@smurf.noris.de> + and more ... %package devel -License: GPL v2 only; LGPL v2.1 only +License: GPL v2 only ; LGPL v2.1 only Requires: %{name} = %{version} +Requires: glibc-devel Summary: C header files for mISDN Group: Development/Libraries/C and C++ @@ -67,31 +69,79 @@ Matthias Urlichs <smurf@smurf.noris.de> and more ... + +%package gui +License: GPL v2 only ; LGPL v2.1 only +Summary: Qt application to watch the status of mISDN cards +Group: System/X11/Utilities + +%description gui +This subpackage contain a little Qt tool for watching the status of +ISDN cards. + %prep -%setup -q -n mISDNuser +%setup -q %build -export SUSE_ASNEEDED=0 -make EXTRA_CFLAGS="$RPM_OPT_FLAGS" +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +#export SUSE_ASNEEDED=0 + +aclocal +libtoolize --force --automake --copy +automake --add-missing --copy +autoconf + +export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS" + +%configure --enable-gui --enable-example %install -make INSTALL_PREFIX=$RPM_BUILD_ROOT INSTALL_LIBDIR=%{_libdir}/ install +DESTDIR=${RPM_BUILD_ROOT} make install + +%post +ldconfig + +%postun +ldconfig %files %defattr(-,root,root) -#%doc -/usr/bin/* -%{_libdir}/libmisdn.so +%doc NEWS ChangeLog README INSTALL +/usr/bin/l1oipctrl +/usr/bin/misdn_bridge +/usr/bin/misdn_info +/usr/bin/misdn_log +/usr/bin/misdnportinfo +/usr/bin/misdntestcon +/usr/bin/misdntestlayer1 +/usr/bin/misdntestlayer3 + +/usr/sbin/* + +%{_libdir}/libmisdn.so.0 +%{_libdir}/libmisdn.so.0.2.1 +%{_libdir}/libsuppserv.so.0 +%{_libdir}/libsuppserv.so.0.1.1 %files devel %defattr(-,root,root) -%dir /usr/include/mISDNuser -%attr (0644, root, root) /usr/include/mISDNuser/.h -%attr (0644, root, root) %{_libdir}/libmisdn.a +%dir /usr/include/mISDN +%attr (0644, root, root) /usr/include/mISDN/.h +%attr (0644, root, root) %{_libdir}/libmisdn.a +%attr (0644, root, root) %{_libdir}/libmisdn.la +%attr (0644, root, root) %{_libdir}/libmisdn.so +%attr (0644, root, root) %{_libdir}/libsuppserv.so +%attr (0644, root, root) %{_libdir}/libsuppserv.a +%attr (0644, root, root) %{_libdir}/libsuppserv.la -%changelog - Thu Mar 18 2010 Carsten Schoene <cs@linux-administrator.com> - 1.1.21-1 -- update to release 1.1.21 +%files gui +%defattr(-,root,root) +/usr/bin/qmisdnwatch +%changelog +* Fri Jun 19 2009 coolo@novell.com +- disable as-needed for this package as it fails to build with it * Mon Sep 1 2008 kkeil@suse.de - first version
[-] [+]	Deleted	mISDNuser-makefile.patch ^
@@ -1,57 +0,0 @@ ---- suppserv/Makefile.orig 2008-05-29 10:37:21.000000000 +0200 -+++ suppserv/Makefile 2008-05-29 10:37:39.000000000 +0200 -@@ -12,9 +12,9 @@ - main: $(SUPPSERVOBJ) - - install: -- install -m 644 libsuppserv.a $(INSTALL_PREFIX)/usr/lib -- install -m 644 libsuppserv_pic.a $(INSTALL_PREFIX)/usr/lib -- install -m 644 libsuppserv.so $(INSTALL_PREFIX)/usr/lib -+ install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR) -+ install -m 644 libsuppserv_pic.a $(INSTALL_PREFIX)/$(LIBDIR) -+ install -m 644 libsuppserv.so $(INSTALL_PREFIX)/$(LIBDIR) - cp .h $(INSTALL_PREFIX)/usr/include/mISDNuser/ - - libsuppserv_pic.a: $(SUPPSERV_PICOBJ) ---- i4lnet/Makefile.orig 2008-05-29 10:36:33.000000000 +0200 -+++ i4lnet/Makefile 2008-05-29 10:36:54.000000000 +0200 -@@ -5,9 +5,9 @@ - all: libisdnnet.a libisdnnet_pic.a libisdnnet.so - - install: -- install -m 644 libisdnnet.a $(INSTALL_PREFIX)/usr/lib -- install -m 644 libisdnnet_pic.a $(INSTALL_PREFIX)/usr/lib -- install -m 644 libisdnnet.so $(INSTALL_PREFIX)/usr/lib -+ install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR) -+ install -m 644 libisdnnet_pic.a $(INSTALL_PREFIX)/$(LIBDIR) -+ install -m 644 libisdnnet.so $(INSTALL_PREFIX)/$(LIBDIR) - cp .h $(INSTALL_PREFIX)/usr/include/mISDNuser/ - - ISDNNET_OBJ = net_if.o isdn_debug.o isdn_msg.o fsm.o net_l2.o tei.o net_l3.o \ ---- lib/Makefile.orig 2008-05-29 10:34:50.000000000 +0200 -+++ lib/Makefile 2008-05-29 10:35:15.000000000 +0200 -@@ -5,9 +5,9 @@ - all: libmISDN.a libmISDN_pic.a libmISDN.so - - install: -- install -m 644 libmISDN.so $(INSTALL_PREFIX)/usr/lib -- install -m 644 libmISDN_pic.a $(INSTALL_PREFIX)/usr/lib -- install -m 644 libmISDN.a $(INSTALL_PREFIX)/usr/lib -+ install -m 644 libmISDN.so $(INSTALL_PREFIX)/$(LIBDIR) -+ install -m 644 libmISDN_pic.a $(INSTALL_PREFIX)/$(LIBDIR) -+ install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR) - - LIBMISDN_OBJS = device.o layer.o stack.o status.o - LIBMISDN_PICOBJS = $(LIBMISDN_OBJS:%.o=%.lo) ---- Makefile.orig 2008-05-29 10:32:46.000000000 +0200 -+++ Makefile 2008-05-29 10:33:26.000000000 +0200 -@@ -25,7 +25,9 @@ - INCLUDEDIR := $(mISDN_DIR)/include - export INCLUDEDIR - -+ifndef LIBDIR - LIBDIR=/usr/lib -+endif - export LIBDIR - - CFLAGS:= -g -Wall -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
	Deleted	mISDNuser-1.1.21.tar.bz2 ^
	Deleted	mISDNuser-1_1_8.tar.bz2 ^
	Changed	mISDNuser-2.0.1.tar.bz2 ^