- fix missing extern for global var

[packages/dchub.git] / dchub.spec

diff --git a/dchub.spec b/dchub.spec
index 6f93394d4163865057c8126a4e00444cfc234b02..fff2c7d776b072f5014bf23bd02aa1e06c4c979b 100644 (file)
--- a/dchub.spec
+++ b/dchub.spec
@@ -1,8 +1,8 @@
 Summary:       Direct Connect Hub
-Summary(pl):   Serwer Direct Connect
+Summary(pl.UTF-8):     Serwer Direct Connect
 Name:          dchub
 Version:       0.5.2
-Release:       4
+Release:       20
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://ac2i.homelinux.com/dctc/%{name}-%{version}.tar.gz
@@ -11,24 +11,34 @@ Patch0:             %{name}-configdir.patch
 Patch1:                %{name}-init.patch
 Patch2:                %{name}-crcdir.patch
 Patch3:                %{name}-pic.patch
+Patch4:                am.patch
+Patch5:                format-security.patch
+Patch6:                trampoline.patch
+Patch7:                missing-extern.patch
 URL:           http://ac2i.homelinux.com/dctc/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: gettext-tools
+# for AM_PATH_GLIB macro
+BuildRequires: glib-devel
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: libgcrypt-devel >= 1.1.12
 BuildRequires: libxml2-devel
+BuildRequires: openssl-devel
 BuildRequires: perl-devel
-BuildRequires: python-devel
 BuildRequires: pkgconfig
-Requires:      perl-Locale-gettext
+BuildRequires: python-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
+Requires:      perl-Locale-gettext
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 dchub is a hub of direct connect file sharing network.
 
-%description -l pl
-dchub jest hubem sieci direct connect s³u¿±cej do wymiany plików.
+%description -l pl.UTF-8
+dchub jest hubem sieci direct connect służącej do wymiany plików.
 
 %prep
 %setup -q
@@ -36,6 +46,10 @@ dchub jest hubem sieci direct connect s
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__aclocal}
@@ -47,41 +61,33 @@ dchub jest hubem sieci direct connect s
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d ${RPM_BUILD_ROOT}/{%{_sysconfdir}/{%{name},rc.d/init.d},/var/lib/%{name}}
-install dchub.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/%{name}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/rc.d/init.d,/var/lib/%{name}}
+install dchub.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install plugin/AUTOSTART $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/AUTOSTART
+install plugin/AUTOSTART $RPM_BUILD_ROOT%{_libexecdir}/%{name}/plugins/AUTOSTART
 
 # delete unnecesary files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/Makefile
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.c
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.h
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/scripts/po
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/plugins/Makefile
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/plugins/*.c
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/plugins/*.h
+%{__rm} -r $RPM_BUILD_ROOT%{_libexecdir}/%{name}/scripts/po
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "$1" = "1" ]; then
-       /sbin/chkconfig --add dchub
-fi
-if [ -f /var/lock/subsys/dchub ]; then
-       /etc/rc.d/init.d/dchub restart >&2
-else
-       echo "Run /etc/rc.d/init.d/dchub start to start dchub daemon"
-fi
+/sbin/chkconfig --add dchub
+%service dchub restart
 
 %preun
 if [ "$1" = "0" ]; then
        /sbin/chkconfig --del dchub
-       if [ -f /var/lock/subsys/dchub ]; then
-               /etc/rc.d/init.d/dchub stop >&2
-       fi
+       %service dchub stop
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -90,25 +96,25 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %doc Documentation/*.fr
 %lang(nl) %doc Documentation/*.nl
 %dir %{_sysconfdir}/%{name}
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/tools
-%attr(755,root,root) %{_libdir}/%{name}/tools/*
-%dir %{_libdir}/%{name}/extprog
-%config(noreplace) %verify(not md5 size mtime) %{_libdir}/%{name}/extprog/AUTOSTART
-%attr(755,root,root) %{_libdir}/%{name}/extprog/[CDPdm]*
-%dir %{_libdir}/%{name}/plugins
-%config(noreplace) %verify(not md5 size mtime) %{_libdir}/%{name}/plugins/AUTOSTART
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
-%dir %{_libdir}/%{name}/scripts
-%attr(755,root,root) %{_libdir}/%{name}/scripts/*.pl
-%config(noreplace) %verify(not md5 size mtime) %{_libdir}/%{name}/scripts/dchub_scripts.conf
-%dir %{_libdir}/%{name}/scripts/i18n
-%lang(de) %{_libdir}/%{name}/scripts/i18n/de
-%lang(fr) %{_libdir}/%{name}/scripts/i18n/fr
-%lang(hu) %{_libdir}/%{name}/scripts/i18n/hu
-%lang(sv) %{_libdir}/%{name}/scripts/i18n/sv
+%dir %{_libexecdir}/%{name}
+%dir %{_libexecdir}/%{name}/tools
+%attr(755,root,root) %{_libexecdir}/%{name}/tools/*
+%dir %{_libexecdir}/%{name}/extprog
+%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/%{name}/extprog/AUTOSTART
+%attr(755,root,root) %{_libexecdir}/%{name}/extprog/[CDPdm]*
+%dir %{_libexecdir}/%{name}/plugins
+%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/%{name}/plugins/AUTOSTART
+%attr(755,root,root) %{_libexecdir}/%{name}/plugins/*.so
+%dir %{_libexecdir}/%{name}/scripts
+%attr(755,root,root) %{_libexecdir}/%{name}/scripts/*.pl
+%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/%{name}/scripts/dchub_scripts.conf
+%dir %{_libexecdir}/%{name}/scripts/i18n
+%lang(de) %{_libexecdir}/%{name}/scripts/i18n/de
+%lang(fr) %{_libexecdir}/%{name}/scripts/i18n/fr
+%lang(hu) %{_libexecdir}/%{name}/scripts/i18n/hu
+%lang(sv) %{_libexecdir}/%{name}/scripts/i18n/sv
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %dir /var/lib/%{name}