- do not use *.spec.in template, use *.spec file with RPM macros

instead
- 3.1.0

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-update?expand=0&rev=231
This commit is contained in:
ZYpp Developers 2013-10-08 13:28:36 +00:00 committed by Git OBS Bridge
parent ca0e7754f1
commit a84c946fa1
4 changed files with 34 additions and 45 deletions

View File

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

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 19 17:42:57 UTC 2013 - lslezak@suse.cz
- do not use *.spec.in template, use *.spec file with RPM macros
instead
- 3.1.0
-------------------------------------------------------------------
Fri Sep 13 11:03:26 UTC 2013 - lslezak@suse.cz

View File

@ -17,14 +17,14 @@
Name: yast2-update
Version: 3.0.4
Version: 3.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-update-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools
BuildRequires: yast2-devtools >= 3.0.6
# xmllint
BuildRequires: libxml2
@ -76,59 +76,41 @@ Use this component if you wish to update your system.
Use this component if you wish to update your system.
%prep
%setup -n yast2-update-%{version}
%setup -n %{name}-%{version}
%build
%{_prefix}/bin/y2tool y2autoconf
%{_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
%yast_build
%install
make install DESTDIR="$RPM_BUILD_ROOT"
[ -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"
%yast_install
%files
%defattr(-,root,root)
%{_prefix}/lib/YaST2/bin/*
/usr/share/YaST2/modules/*
%{yast_ybindir}/*
%{yast_moduledir}/*
/usr/share/YaST2/clients/inst_rootpart.rb
/usr/share/YaST2/clients/inst_update.rb
/usr/share/YaST2/clients/inst_backup.rb
/usr/share/YaST2/clients/rootpart_proposal.rb
/usr/share/YaST2/clients/update_proposal.rb
/usr/share/YaST2/clients/packages_proposal.rb
/usr/share/YaST2/clients/backup_proposal.rb
/usr/share/YaST2/clients/inst_update_partition.rb
/usr/share/YaST2/clients/inst_update_partition_auto.rb
/usr/share/YaST2/clients/rootpart_check_keyboard.rb
%{yast_clientdir}/inst_rootpart.rb
%{yast_clientdir}/inst_update.rb
%{yast_clientdir}/inst_backup.rb
%{yast_clientdir}/rootpart_proposal.rb
%{yast_clientdir}/update_proposal.rb
%{yast_clientdir}/packages_proposal.rb
%{yast_clientdir}/backup_proposal.rb
%{yast_clientdir}/inst_update_partition.rb
%{yast_clientdir}/inst_update_partition_auto.rb
%{yast_clientdir}/rootpart_check_keyboard.rb
/usr/share/YaST2/include/update
/usr/share/YaST2/include/update/rootpart.rb
%{yast_yncludedir}/update
%{yast_yncludedir}/update/rootpart.rb
%doc %{_prefix}/share/doc/packages/yast2-update
%doc %{yast_docdir}
%files FACTORY
%defattr(-,root,root)
%{_prefix}/share/applications/YaST2/update.desktop
%{yast_desktopdir}/update.desktop
%dir /usr/share/YaST2/control
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.rb
/usr/share/YaST2/clients/run_update.rb
%{yast_clientdir}/update.rb
%{yast_clientdir}/run_update.rb
%changelog