Merge pull request #4233 from masatake/rpmspec--minor

RpmSpec: don't make a FQ tag for sub-packages if -n option is specified on %package line

Author: masatake

Units/parser-rpmspec.r/simple-rpmspec.d/expected.tags

@@ -20,7 +20,6 @@ install_post	input.spec	/^%define install_post \\$/;"	kind:macro	line:31	roles:d
 docs	input.spec	/^%package docs$/;"	kind:package	line:40	package:ctags	roles:def
 ctags-docs	input.spec	/^%package docs$/;"	kind:package	line:40	package:ctags	roles:def
 universal-ctags-devel	input.spec	/^%package -n universal-ctags-devel$/;"	kind:package	line:44	package:ctags	roles:def
-ctags-universal-ctags-devel	input.spec	/^%package -n universal-ctags-devel$/;"	kind:package	line:44	package:ctags	roles:def
 libxml	input.spec	/^%configure --with-libxml=%{YES} --with-libyml=%{YES}\\$/;"	kind:optwith	line:52	roles:cmdline
 libyml	input.spec	/^%configure --with-libxml=%{YES} --with-libyml=%{YES}\\$/;"	kind:optwith	line:52	roles:cmdline
 foo	input.spec	/^	   --without-foo --enable-bar \\$/;"	kind:optwith	line:53	roles:cmdline

parsers/rpmspec.c

@@ -10,14 +10,14 @@
 *   References:
 *   	- https://rpm-software-management.github.io/rpm/manual/macros.html
 *   	- https://rpm-software-management.github.io/rpm/manual/spec.html
+*   	- http://ftp.rpm.org/api/4.4.2.2/dependencies.html
 */
 
 /*
  * TODO
  *
  * 1. Capturing required and provide packages as reference tags
  * 2. Capturing bz numbers and package versions in %changelog section
- * 3. Capturing %configure --enable-FOO --with-BAR
  */
 #include "general.h"  /* must always come first */
 
@@ -311,17 +311,40 @@ static bool found_package_cb (const char *line,
 			      unsigned int count,
 			      void *userData)
 {
-	if (count > 0)
-	{
-		vString *name = vStringNew ();
-		tagEntryInfo tag;
+	if (count == 0)
+		return true;
+
+	/* ---
+	 * NAME: foo
+	 * %package bar
+	 * ---
+	 * In this case, emit foo-bar as a FQ tag.
+	 *
+	 * ---
+	 * NAME: foo
+	 * %package -n baz
+	 * ---
+	 * In this case, don't emit FQ tag.
+	 */
+	bool fq = true;
+
+	/* strlen("-n") => 2 */
+	if (matches[1].length > 2)
+		fq = false;
+
+	vString *name = vStringNew ();
+	tagEntryInfo tag;
+
+	vStringNCopyS (name, line + matches[2].start, matches[2].length);
+	initTagEntry (&tag, vStringValue (name), K_PACKAGE);
+	tag.extensionFields.scopeIndex = ((struct rpmSpecCtx *)userData)->package_index;
+
+	if (!fq)
+		tag.skipAutoFQEmission = 1;
+
+	makeTagEntry (&tag);
+	vStringDelete (name);
 
-		vStringNCopyS (name, line + matches[2].start, matches[2].length);
-		initTagEntry (&tag, vStringValue (name), K_PACKAGE);
-		tag.extensionFields.scopeIndex = ((struct rpmSpecCtx *)userData)->package_index;
-		makeTagEntry (&tag);
-		vStringDelete (name);
-	}
 	return true;
 }