Changes - j0ke.net Open Build Service

Changes of Revision 12

[-] [+]	Changed	varnish.spec
@@ -1,7 +1,7 @@ # norootforbuild %define default_patch_fuzz 0 -Name: varnish +Name: varnish20-uplex Version: 2.0.3 Release: 1uplx # @@ -12,15 +12,18 @@ BuildRequires: ncurses-devel libxslt Requires: gcc %define _bindir %{_sbindir} -%define pkg_home %{_var}/lib/%{name} -%define pkg_logdir %{_var}/log/%{name} -%define pkg_cachedir %{_var}/cache/%{name} -%define pkg_name %{name} +%define pkg_home %{_var}/lib/%{real_name} +%define pkg_logdir %{_var}/log/%{real_name} +%define pkg_cachedir %{_var}/cache/%{real_name} + +%define real_name varnish +%global upstream_name varnish + + # URL: http://www.varnish-cache.org/ Source: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.bz2 Source2: varnish.init -#Patch0: varnish-redhat-pid.patch Patch1: vslp_203_uplex.patch Summary: Varnish is a high-performance HTTP accelerator @@ -66,7 +69,7 @@ %package devel Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{real_name} = %{version} # Summary: Development files for Varnish %description devel @@ -90,7 +93,7 @@ %debug_package %prep -%setup -n %{name}-%{version} +%setup -n %{real_name}-%{version} #%patch0 %patch1 -p1 ##%patch100 @@ -120,26 +123,26 @@ %if 0%{?suse_version} # # init scripts -%{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} -%{__install} -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/%{name} -%{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +%{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.%{real_name} +%{__install} -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/%{real_name} +%{__ln_s} -f %{_sysconfdir}/init.d/%{real_name} %{buildroot}%{_sbindir}/rc%{real_name} # # config files -%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{name}/default.vcl -%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{name}/default.vcl.example +%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{real_name}/default.vcl +%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{real_name}/default.vcl.example %else # # init scripts -%{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name} -%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_sysconfdir}/init.d/%{name} +%{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{real_name} +%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_sysconfdir}/init.d/%{real_name} # # config files -%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{name}/default.vcl -%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{name}/default.vcl.example +%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{real_name}/default.vcl +%{__install} -D -m 0644 etc/default.vcl %{buildroot}%{_sysconfdir}/%{real_name}/default.vcl.example # directorys %{__install} -m 0755 -d %{buildroot}%{pkg_cachedir} %endif -%{__install} -m 0755 -d %{buildroot}%{_var}/run/%{name} +%{__install} -m 0755 -d %{buildroot}%{_var}/run/%{real_name} %clean %{__rm} -rf %{buildroot} @@ -169,17 +172,17 @@ %files %defattr(-,root,root,-) %if 0%{?suse_version} -%{_sbindir}/rc%{name} -/var/adm/fillup-templates/sysconfig.%{name} +%{_sbindir}/rc%{real_name} +/var/adm/fillup-templates/sysconfig.%{real_name} %else -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/%{real_name} %endif -%config(noreplace) %{_sysconfdir}/init.d/%{name} +%config(noreplace) %{_sysconfdir}/init.d/%{real_name} # -%dir %attr(750,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/ -%config(noreplace) %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/default.vcl -%config %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/default.vcl.example -%dir %attr(750,%{pkg_name},%{pkg_name}) %{_var}/run/%{name}/ +%dir %attr(750,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{real_name}/ +%config(noreplace) %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{real_name}/default.vcl +%config %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{real_name}/default.vcl.example +%dir %attr(750,%{pkg_name},%{pkg_name}) %{_var}/run/%{real_name}/ # %{_sbindir}/varnishd %{_sbindir}/varnishhist