projects
/
platform
/
upstream
/
libsolv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.6.12
[platform/upstream/libsolv.git]
/
package
/
libsolv.spec.in
diff --git
a/package/libsolv.spec.in
b/package/libsolv.spec.in
index
9526e27
..
c2251ec
100644
(file)
--- a/
package/libsolv.spec.in
+++ b/
package/libsolv.spec.in
@@
-18,7
+18,7
@@
Name: libsolv
Version: @VERSION@
Release: 0
Name: libsolv
Version: @VERSION@
Release: 0
-Url:
git://gitorious.org/opensuse/libsolv.git
+Url:
https://github.com/openSUSE/libsolv
Source: libsolv-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: libsolv-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@
-34,7
+34,7
@@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libneon0.26-devel
%endif
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
BuildRequires: libneon0.26-devel
%endif
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
-BuildRequires: db
4
-devel
+BuildRequires: db-devel
%endif
%if 0%{?suse_version}
%if 0%{?suse_version} < 1030
%endif
%if 0%{?suse_version}
%if 0%{?suse_version} < 1030
@@
-64,7
+64,7
@@
BuildRequires: perl-devel
BuildRequires: swig
%endif
%if %{with ruby_binding}
BuildRequires: swig
%endif
%if %{with ruby_binding}
-%global ruby_vendorarch %(ruby -r rbconfig -e "puts
Config::CONFIG['vendorarchdir'].nil? ? Config::CONFIG['sitearchdir'] :
Config::CONFIG['vendorarchdir']")
+%global ruby_vendorarch %(ruby -r rbconfig -e "puts
RbConfig::CONFIG['vendorarchdir'].nil? ? RbConfig::CONFIG['sitearchdir'] : Rb
Config::CONFIG['vendorarchdir']")
BuildRequires: ruby
BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: ruby
BuildRequires: ruby-devel
BuildRequires: swig
@@
-94,11
+94,11
@@
A new approach to package dependency solving
%package devel
Summary: A new approach to package dependency solving
Group: Development/Libraries/C and C++
%package devel
Summary: A new approach to package dependency solving
Group: Development/Libraries/C and C++
-Requires: libsolv-tools = %version
%if !%{with disable_shared}
Requires: libsolv@LIBSOLV_SOVERSION@ = %version
%endif
Requires: rpm-devel
%if !%{with disable_shared}
Requires: libsolv@LIBSOLV_SOVERSION@ = %version
%endif
Requires: rpm-devel
+Conflicts: libsatsolver-devel
%description devel
Development files for libsolv, a new approach to package dependency solving
%description devel
Development files for libsolv, a new approach to package dependency solving
@@
-108,6
+108,7
@@
Summary: A new approach to package dependency solving
Group: Development/Libraries/C and C++
Obsoletes: satsolver-tools < 0.18
Provides: satsolver-tools = 0.18
Group: Development/Libraries/C and C++
Obsoletes: satsolver-tools < 0.18
Provides: satsolver-tools = 0.18
+Conflicts: satsolver-tools-obsolete
Requires: gzip bzip2 coreutils findutils
%description tools
Requires: gzip bzip2 coreutils findutils
%description tools
@@
-123,6
+124,7
@@
Requires: gnupg2
%if 0%{?suse_version}
Requires: gpg2
%endif
%if 0%{?suse_version}
Requires: gpg2
%endif
+Conflicts: libsatsolver-demo
%description demo
Applications demoing the libsolv library.
%description demo
Applications demoing the libsolv library.
@@
-164,7
+166,7
@@
CMAKE_FLAGS=
CMAKE_FLAGS="-DFEDORA=1"
%endif
%if 0%{?suse_version}
CMAKE_FLAGS="-DFEDORA=1"
%endif
%if 0%{?suse_version}
-CMAKE_FLAGS="-DSUSE=1"
+CMAKE_FLAGS="-DSUSE=1
-DENABLE_APPDATA=1 -DENABLE_COMPS=1
"
%endif
cmake $CMAKE_FLAGS \
%endif
cmake $CMAKE_FLAGS \
@@
-216,9
+218,11
@@
rm -rf "$RPM_BUILD_ROOT"
%defattr(-,root,root)
%if 0%{?suse_version}
%exclude %{_bindir}/helix2solv
%defattr(-,root,root)
%if 0%{?suse_version}
%exclude %{_bindir}/helix2solv
+%exclude %{_mandir}/man1/helix2solv*
%endif
%exclude %{_bindir}/solv
%{_bindir}/*
%endif
%exclude %{_bindir}/solv
%{_bindir}/*
+%{_mandir}/man1/*
%files devel
%defattr(-,root,root)
%files devel
%defattr(-,root,root)
@@
-233,9
+237,11
@@
rm -rf "$RPM_BUILD_ROOT"
%{_includedir}/solv
%if 0%{?suse_version}
%{_bindir}/helix2solv
%{_includedir}/solv
%if 0%{?suse_version}
%{_bindir}/helix2solv
+%{_mandir}/man1/helix2solv*
%endif
%{_datadir}/cmake/Modules/*
%endif
%{_datadir}/cmake/Modules/*
-%{_mandir}/man?/*
+%{_libdir}/pkgconfig/libsolv.pc
+%{_mandir}/man3/*
%files demo
%defattr(-,root,root)
%files demo
%defattr(-,root,root)