Add manpage for solv tool

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 738a0408489d9c709b4a7cdb2e3c088e3412f6ec..66011b48d8f934a1fdbf63402e15cbd6454cdda9 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,7 +4,7 @@ SET (libsolv_MANPAGES3
     libsolv-pool.3)
 
 SET (libsolv_MANPAGES1
-    mergesolv.1 dumpsolv.1 installcheck.1 testsolv.1 repo2solv.1)
+    mergesolv.1 dumpsolv.1 installcheck.1 testsolv.1 repo2solv.1 solv.1)
 
 IF (ENABLE_RPMDB)
 SET (libsolv_MANPAGES1 ${libsolv_MANPAGES1} rpmdb2solv.1 rpms2solv.1)

diff --git a/doc/Makefile.gen b/doc/Makefile.gen
index ec2880e609d5701da2a2736e72da0f9675a1ded6..e9f1b69fa560165aa9491a97347d9443255f3427 100644 (file)
--- a/doc/Makefile.gen
+++ b/doc/Makefile.gen
@@ -8,7 +8,7 @@ man3:   libsolv.3 libsolv-bindings.3 libsolv-constantids.3 libsolv-history.3 libso
 man1:  mergesolv.1 dumpsolv.1 installcheck.1 testsolv.1 rpmdb2solv.1 rpms2solv.1 \
        rpmmd2solv.1 repomdxml2solv.1 updateinfoxml2solv.1 deltainfoxml2solv.1 \
        helix2solv.1 susetags2solv.1 comps2solv.1 deb2solv.1 mdk2solv.1 \
-       archpkgs2solv.1 archrepo2solv.1 appdata2solv.1 repo2solv.1
+       archpkgs2solv.1 archrepo2solv.1 appdata2solv.1 repo2solv.1 solv.1
 
 html: libsolv.html libsolv-bindings.html libsolv-constantids.html libsolv-history.html libsolv-pool.html
 

diff --git a/doc/solv.txt b/doc/solv.txt
new file mode 100644 (file)
index 0000000..936ae78
--- /dev/null
+++ b/doc/solv.txt
@@ -0,0 +1,73 @@
+solv(1)
+=======
+:man manual: LIBSOLV
+:man source: libsolv
+
+
+Name
+----
+solv - example package manager based on libsolv
+
+Synopsis
+--------
+*solv* install [OPTIONS] PKG...
+
+*solv* erase [OPTIONS] PKG...
+
+*solv* list [OPTIONS] PKG...
+
+*solv* info [OPTIONS] PKG...
+
+*solv* search [OPTIONS] STRING...
+
+*solv* verify [OPTIONS] PKG...
+
+*solv* update [OPTIONS] PKG...
+
+*solv* dist-upgrade [OPTIONS] PKG...
+
+*solv* repolist [OPTIONS]
+
+Description
+-----------
+The solv tool demos some features of the libsolv library. It is not
+meant to replace a real package manager, for example it does not cache
+downloaded packages.
+
+*--root* 'ROOTDIR'::
+Install packages using 'ROOTDIR' as root of the filesystem. This also
+means that the package database of 'ROOTDIR' will be used.
+
+*--clean*::
+Also get rid of no longer needed packages when erasing, like libraries
+that have been used by the erased packages.
+
+*--best*::
+Force usage of the best package (normally the one with the highest
+version) for install and update operations.
+
+*--testcase*::
+Write a testcase after dependency solving.
+
+The following options can be used to filter the packages. If the
+same option is used multiple times, the result is ORed together.
+
+*-i*::
+Limit the packages to installed ones.
+
+*-r* 'REPO'::
+Limit the packages to the specified repository.
+
+*--arch* 'ARCHITECTURE'::
+Limit the packages to the specified package architecture.
+
+*--type* 'TYPE'::
+Limit the packages to the specified package type.
+
+Author
+------
+Michael Schroeder <mls@suse.de>
+
+////
+vim: syntax=asciidoc
+////

diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in
index ddaae0ffd21d9f7592bf7d57c8f1a2596dd63bb4..ca649e80beb1531eac6d4bf8345259dfc281692d 100644 (file)
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -283,6 +283,7 @@ make ARGS=--output-on-failure test
 %exclude %{_bindir}/helix2solv
 %exclude %{_mandir}/man1/helix2solv*
 %endif
+%exclude %{_mandir}/man1/solv.1*
 %exclude %{_bindir}/solv
 %{_bindir}/*
 %{_mandir}/man1/*
@@ -309,6 +310,7 @@ make ARGS=--output-on-failure test
 %files demo
 %defattr(-,root,root)
 %{_bindir}/solv
+%{_mandir}/man1/solv.1*
 
 %if %{with perl}
 %files -n perl-solv