Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Will now copy both source files and patch files declared in the spec #464

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

arcivanov
Copy link
Contributor

Also fix some spelling errors

fixes #463

@arcivanov
Copy link
Contributor Author

with the above PR the srpm build succeeds as follows:

Copying git source to: /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb
Command: cd /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/ && tar xzf smartmontools-next-git-182.802bcdb.tar.gz
Status code: 0
Command output: 

Show contents of the directory structure we just extracted:
['tests', 'smartmontools.sysconf', 'smartmontools.spec', 'smartmontools-5.38-defaultconf.patch', 'smartmontools', 'smartmon.te.f33', 'smartmon.te', 'smartmon.if', 'smartmon.fc', 'smartdnotify', 'drivedb.h', '.tito', '.gitmodules', '.gitignore']
Looking for .spec in /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb
Using file: smartmontools.spec
Command: cp /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb.tar.gz /tmp/tito/
Status code: 0
Command output: 

Wrote: /tmp/tito/smartmontools-next-git-182.802bcdb.tar.gz
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmontools.sysconf -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartdnotify -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmon.te -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmon.if -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmon.fc -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmon.te.f33 -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Copying /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmontools-5.38-defaultconf.patch -> /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES
Creating srpm from spec file: /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmontools.spec
*NOT* using dist at all
Command: rpm --eval '%scl'
Status code: 0
Command output: %scl


D: created directory(s) /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/BUILDROOT mode 0755
setting SOURCE_DATE_EPOCH=1680652800
D: Signature: size(4404)+pad(4)
D: Signature: size(4404)+pad(4)
Wrote: /tmp/tito/smartmontools-next-7.4.138-1.git.182.802bcdb.fc38.src.rpm


Command: rpmbuild -vvv --eval '%undefine scl' --define "_topdir /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf" --define "_sourcedir /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES" --define "_builddir /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/BUILD" --define "_srcrpmdir /tmp/tito" --define "_rpmdir /tmp/tito"   --nodeps -bs /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/SOURCES/smartmontools-next-git-182.802bcdb/smartmontools.spec

Status code: 0

Command output: ['', 'D: created directory(s) /tmp/tito/rpmbuild-smartmontools-nexta2joqqqf/BUILDROOT mode 0755', 'setting SOURCE_DATE_EPOCH=1680652800', 'D: Signature: size(4404)+pad(4)', 'D: Signature: size(4404)+pad(4)', 'Wrote: /tmp/tito/smartmontools-next-7.4.138-1.git.182.802bcdb.fc38.src.rpm']

Found wrote line: /tmp/tito/smartmontools-next-7.4.138-1.git.182.802bcdb.fc38.src.rpm

@arcivanov
Copy link
Contributor Author

@FrostyX This now blocks COPR builds so please merge ASAP if possible and release new version of tito.

https://download.copr.fedorainfracloud.org/results/karellen/smartmontools-next/srpm-builds/06132422/builder-live.log.gz

@xsuchy
Copy link
Member

xsuchy commented Jul 1, 2023

Hmm, the original purpose of Tito was to be able to have applied patches in upstream git. And with tito.distributionbuilder.DistributionBuilder tito will create these patches on the fly.
But if you really want to use it this way... then I see no harm in accepting this PR.

@arcivanov
Copy link
Contributor Author

arcivanov commented Jul 1, 2023

I'm using it with Submoduleaware Builder and patching the submodule files external to the project.
I'm also basically forking the other project that uses patches and largely maintaining the upstream spec for future compatibility.

I appreciate the approval.

@arcivanov
Copy link
Contributor Author

@FrostyX bump

@FrostyX
Copy link
Member

FrostyX commented Jul 7, 2023

This is a feature that multiple people recently asked about.
Thank you for implementing it.

I am merging and going to do a new release right after.

@FrostyX FrostyX merged commit 369c6ba into rpm-software-management:master Jul 7, 2023
@FrostyX
Copy link
Member

FrostyX commented Jul 8, 2023

The new version is 0.6.24
https://bodhi.fedoraproject.org/updates/?packages=tito

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tito fails to copy patches from the spec during srpm build causing a failure
3 participants