Changes - j0ke.net Open Build Service

Changes of Revision 3

[-] [+]	Changed	c-icap.spec
@@ -11,7 +11,7 @@ Source3: %{name}.init Source4: %{name}.sysconfig Source5: %{name}.logrotate -#Patch: %{cname}-%{oversion}.patch +Patch0: %{name}.conf.patch Group: Productivity/Networking/Security Summary: Is an implementation of an ICAP server Url: http://c-icap.sourceforge.net/ @@ -66,18 +66,24 @@ %prep %setup -q -n %{cname}-%{version} +%patch0 %build export CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \ --bindir=%{_sbindir} \ - --libexecdir=%{_prefix}/lib/%{cname} \ + --libexecdir=%{_libdir}/%{cname} \ --sysconfdir=%{_sysconfdir}/%{cname} \ --localstatedir=%{_localstatedir} \ --libdir=%{_libdir} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --docdir=%{_docdir}/%{cname} + --docdir=%{_docdir}/%{cname} \ + --enable-ipv6 \ + --enable-largefiles \ + --enable-sysvipc \ + --enable-shared \ + --enable-static make @@ -86,7 +92,10 @@ %__rm -rf %buildroot%{_localstatedir}/log %__rm -f %buildroot%{_sysconfdir}/%{cname}/.default %__mkdir_p -m 0755 %buildroot%{_localstatedir}/log -%__mkdir_p -m 0700 %buildroot%{_localstatedir}/log/%{cname} +%__mkdir_p -m 0700 %buildroot%{_localstatedir}/log/%{name} +%__mkdir_p -m 0755 %buildroot%{_localstatedir}/run +%__mkdir_p -m 0700 %buildroot%{_localstatedir}/run/%{name} +%__mkdir_p -m 0755 %buildroot%{_datadir}/%{cname}/templates %__mkdir_p -m 0755 %buildroot%{_localstatedir}/spool %__mkdir_p -m 0700 %buildroot%{_localstatedir}/spool/%{cname} %__mkdir_p -m 0700 %buildroot%{_localstatedir}/spool/%{cname}/tmp @@ -127,6 +136,8 @@ %{_mandir}/man8/c-icap-stretch.8 %{_mandir}/man8/c-icap.8* %dir %{_sysconfdir}/%{cname} +%dir %{_datadir}/%{cname} +%dir %{_datadir}/%{cname}/templates %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/%{cname}/c-icap.conf %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/%{cname}/c-icap.magic %config %{_sysconfdir}/init.d/%{name} @@ -139,7 +150,8 @@ %attr(0755, root, root) %{_sbindir}/c-icap-stretch %{_sbindir}/rc%{name} %dir %{_libdir}/%{cname} -%dir %attr(-, vscan, root) %{_localstatedir}/log/%{cname} +%dir %attr(-, vscan, root) %{_localstatedir}/log/%{name} +%dir %attr(-, vscan, root) %{_localstatedir}/run/%{name} %dir %attr(-, vscan, root) %{_localstatedir}/spool/%{cname} %dir %attr(-, vscan, root) %{_localstatedir}/spool/%{cname}/tmp %dir %attr(-, vscan, root) %{_localstatedir}/spool/%{cname}/download @@ -154,6 +166,7 @@ %{_sbindir}/c-icap-libicapapi-config %attr(0644, root, root) %{_libdir}/%{cname}/.la %attr(0644, root, root) %{_libdir}/libicapapi.la +%{_libdir}/%{cname}/.a %dir %{_includedir}/%{cname} %{_includedir}/%{cname}/.h %{_mandir}/man8/c-icap-config.8
[-] [+]	Added	c-icap.conf.patch ^
@@ -0,0 +1,29 @@ +--- c-icap.conf.in.orig 2012-12-27 21:00:43.708122400 +0100 ++++ c-icap.conf.in 2012-12-27 21:02:17.916122138 +0100 +@@ -181,7 +181,7 @@ + # The location of modules + # Default: + # ModulesDir @prefix@/lib/c_icap +-ModulesDir @prefix@/lib/c_icap ++ModulesDir @libexecdir@/c_icap + + # TAG: ServicesDir + # Format: ServicesDir dir +@@ -189,7 +189,7 @@ + # The location of services + # Default: + # ServicesDir @prefix@/lib/c_icap +-ServicesDir @prefix@/lib/c_icap ++ServicesDir @libexecdir@/c_icap + + # TAG: TemplateDir + # Format: TemplateDir dir +@@ -222,7 +222,7 @@ + # It can be used more than once to use multiple magic files. + # Default: + # LoadMagicFile @prefix@/etc/c-icap.magic +-LoadMagicFile @prefix@/etc/c-icap.magic ++LoadMagicFile @sysconfdir@/c-icap.magic + + # TAG: RemoteProxyUsers + # Format: RemoteProxyUsers onoff
	Added	c_icap_modules-0.2.3.tar.bz2 ^