Updated to git ref b5973da

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-proxy?expand=0&rev=111
This commit is contained in:
ZYpp Developers 2013-10-16 08:55:58 +00:00 committed by Git OBS Bridge
parent 05fbe59306
commit 53cc00704b
4 changed files with 24 additions and 36 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ee07a5f4da9bca203a657e38dabd74e2ab80d1c27e889828fe7cdd88de508a6
size 97515

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1efc32566ef050119c93bdc85c0bb090aeb19a3538547a346cfe92203d8f3120
size 24467

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 19 15:04:31 UTC 2013 - lslezak@suse.cz
- do not use *.spec.in template, use *.spec file with RPM macros
instead
- 3.1.0
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 31 08:38:05 UTC 2013 - yast-devel@opensuse.org Wed Jul 31 08:38:05 UTC 2013 - yast-devel@opensuse.org

View File

@ -17,18 +17,18 @@
Name: yast2-proxy Name: yast2-proxy
Version: 3.0.0 Version: 3.1.0
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-proxy-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
# should be required by devtools # should be required by devtools
BuildRequires: perl-XML-Writer BuildRequires: perl-XML-Writer
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: rpm BuildRequires: rpm
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: yast2-devtools BuildRequires: yast2-devtools >= 3.0.6
BuildRequires: yast2-testsuite BuildRequires: yast2-testsuite
BuildRequires: yast2 BuildRequires: yast2
@ -51,43 +51,24 @@ Url: http://en.opensuse.org/Portal:YaST
This package contains the YaST2 component for proxy configuration. This package contains the YaST2 component for proxy configuration.
%prep %prep
%setup -n yast2-proxy-%{version} %setup -n %{name}-%{version}
%build %build
%{_prefix}/bin/y2tool y2autoconf %yast_build
%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" %yast_install
[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
%clean
rm -rf "$RPM_BUILD_ROOT"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/usr/share/YaST2/clients/*.rb %{yast_clientdir}/*.rb
/usr/share/YaST2/modules/*.rb %{yast_moduledir}/*.rb
/usr/share/YaST2/include/proxy %{yast_yncludedir}/proxy
%{_prefix}/share/applications/YaST2/*.desktop %{yast_desktopdir}/*.desktop
/usr/share/YaST2/scrconf/*.scr %{yast_scrconfdir}/*.scr
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %{yast_schemadir}/autoyast/rnc/proxy.rnc
%dir %{_prefix}/share/doc/packages/yast2-proxy %dir %{yast_docdir}
%{_prefix}/share/doc/packages/yast2-proxy/COPYING %{yast_docdir}/COPYING
%readme %{_prefix}/share/doc/packages/yast2-proxy/README
%changelog %changelog