X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bitlbee.spec;h=723b731d52db40e4a735478168caa2496dd20480;hb=0ca128fdaf87de22ed51819dc5dd9b6b70bb3beb;hp=1555ca789ab22476a2e18aadd21a7b8988fe2022;hpb=02a404ce5e3bc9c073e6227d07b98f3a58856e94;p=packages%2Fbitlbee.git

diff --git a/bitlbee.spec b/bitlbee.spec
index 1555ca7..723b731 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -2,24 +2,22 @@
 # - sync pl
 #
 # Conditional build:
-%bcond_without	otr		# build without OTR
+%bcond_with		otr		# build without OTR
 %bcond_with		purple	# build with libpurple (not recommended for public servers). http://wiki.bitlbee.org/HowtoPurple
 
 Summary:	An IRC to other chat networks gateway
 Summary(pl.UTF-8):	Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi
 Name:		bitlbee
-Version:	3.0.5
+Version:	3.5.1
 Release:	1
 License:	GPL v2+ and MIT
 Group:		Daemons
 Source0:	http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	9ff97260a2a7f3a7d102db158a8d9887
+# Source0-md5:	ec866f937258c16e1e2e70f3dec67430
 URL:		http://www.bitlbee.org/
 Patch0:		config.patch
-Patch1:		systemd.patch
-Patch2:		skyped-FD_CLOEXEC.patch
-Patch3:		skype-no-groups.patch
 BuildRequires:	asciidoc
+BuildRequires:	glib2-devel >= 1:2.14
 BuildRequires:	gnutls-devel
 %{?with_otr:BuildRequires:	libotr-devel >= 3.2.0}
 %{?with_purple:BuildRequires:	libpurple-devel}
@@ -67,31 +65,13 @@ Requires:	%{name} = %{version}-%{release}
 The bitlbee-otr package includes OTR plugin for bitlbee. Not
 completely stable and not 100% foolproof so use at your own risk.
 
-%package protocol-skype
-Summary:	Skype protocol support for bitlbee
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-Requires:	python-skype
-
-%description protocol-skype
-Skype protocol support for bitlbee.
-
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # fix wrong assumption with $DESTDIR
 %{__sed} -i -e 's,$(shell id -u),0,' Makefile
 
-# fix #!%{_bindir}/env python -> #!%{__python}:
-%{__sed} -i -e '1s,^#!.*python.*,#!%{__python},' protocols/skype/*.py
-
-# fix config path
-%{__sed} -i -e 's,/usr/local/etc/skyped,%{_sysconfdir}/skyped,' protocols/skype/*.py
-
 %build
 CFLAGS="%{rpmcflags}" \
 ./configure \
@@ -106,13 +86,14 @@ CFLAGS="%{rpmcflags}" \
 	--strip=0 \
 	--plugins=1 \
 	--ssl=gnutls \
+	--pie=1 \
 %if %{with purple}
 	--purple=1 \
 %endif
 %if %{with otr}
 	--otr=plugin \
 %endif
-	--skype=plugin \
+	--skype=0
 
 %{__make}
 
@@ -150,7 +131,6 @@ fi
 %{_mandir}/man5/bitlbee.conf.5*
 %{_mandir}/man8/bitlbee.8*
 %{_datadir}/bitlbee
-%dir %{_libdir}/%{name}
 %attr(770,root,bitlbee) %{_localstatedir}/lib/bitlbee
 %{systemdunitdir}/bitlbee.service
 %{systemdunitdir}/bitlbee.socket
@@ -167,13 +147,3 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/otr.so
 %endif
-
-%files protocol-skype
-%defattr(644,root,root,755)
-%doc protocols/skype/{HACKING,NEWS,README,skyped.txt}
-%dir %attr(750,root,bitlbee) %{_sysconfdir}/skyped
-%attr(640,root,bitlbee) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/skyped/skyped.cnf
-%attr(640,root,bitlbee) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/skyped/skyped.conf
-%attr(755,root,root) %{_libdir}/%{name}/skype.so
-%attr(755,root,root) %{_sbindir}/skyped
-%{_mandir}/man1/skyped.1*