Skip to content

Commit

Permalink
Modified spec/header file to address a bug with RPM's automatic depen…
Browse files Browse the repository at this point in the history
…dceny checking.
  • Loading branch information
genereese committed Sep 29, 2016
1 parent 9c294bd commit 27648fb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
12 changes: 7 additions & 5 deletions root/usr/bin/togo
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,11 @@ class Package(SQLObject):
{'#': ' tar / tar.gz / tar.bz2'},
{'Source0' : r'%{name}.tar'},
{'' : ''},

{'#': 'If you are having trouble building a package and need to disable'},
{'#': ' automatic dependency/provides checking, uncomment this:'},
{'#' : r'AutoReqProv: no'},
{'' : ''},

{'#': 'If this package has prerequisites, uncomment this line and'},
{'#': ' list them here - examples are already listed'},
Expand All @@ -637,9 +642,6 @@ class Package(SQLObject):
{'%' : r'define debug_package %{nil}'},
{'' : ''},

{'#': 'If you are having trouble building a package and need to disable'},
{'#': ' automatic dependency/provides checking, uncomment this:'},
{'#' : r'AutoReqProv: no'},
]

self.default_spec_sections = [
Expand Down Expand Up @@ -852,9 +854,9 @@ class Package(SQLObject):
fd.write("%_gpgbin /usr/bin/gpg")
if (disable_dependency_generation):
fd.write('\n')
fd.write(r"%__find_requires %{nil}")
fd.write(r"%_use_internal_dependency_generator %{nil}")
fd.write('\n')
fd.write(r"%_use_internal_dependency_generator %{nil}")
fd.write(r"%__find_requires %{nil}")
fd.close()
log.info('')

Expand Down
7 changes: 7 additions & 0 deletions spec/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
%changelog
* Thu Sep 29 2016 Gene Reese <[email protected]>
- Fixed an issue with AutoReqProv in the generated spec file which was
preventing the option from functioning properly. This fix will only apply to
newly generated spec files. If you need to disable automatic dependency checks
in your existing projects, please move the 'AutoReqProv: no' line above the
'description' directive in the 'spec/header'file of your project.

* Sat May 7 2016 Gene Reese <[email protected]>
- Changed path of togo script
- Added a --nodeps flag to package building to disable automatic dependency
Expand Down
2 changes: 1 addition & 1 deletion spec/header
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Summary: A quick, easy, and powerful RPM authoring tool
Version: 2.3

# The release number of your package
Release: 1
Release: 2

# Any license you wish to list
License: GNU GPL
Expand Down

0 comments on commit 27648fb

Please sign in to comment.