Re: Shipping .orig files
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 04/04/2014 12:45 PM, Stephen Gallagher wrote: On 04/04/2014 11:44 AM, Oden Eriksson wrote: fredagen den 4 april 2014 09.32.06 skrev Orion Poplawski: A number of rpms currently ship .orig files, which are presumably from patching the files in the spec. Would it make sense to have rpm complain about this? No, if -b is used there won't be a .orig file, unless it's named so. I'm not sure when this changed, but I just did the following experiment on nodejs-less (one of the identified packages from the original message): 1) Extract tarball 2) Validate that bin/lessc is the only file in the bin/ directory 3) patch -p1 0001-Require-include-files-from-the-default-location.patch 4) Look at bin/lessc: it created a .orig file Digging much deeper, it appears that this is because my patch applied with an offset. The default behavior of patch on Fedora appears to be --backup-if-mismatch, hence the creation of the .orig file. I'd be inclined to suggest that we may want to file a bug against redhat-rpm-macros and get the %patch macro updated to include --no-backup-if-mismatch in rpmbuild. Yeah, this is what I was seeing too. It's been suggested before apparently: https://bugzilla.redhat.com/show_bug.cgi?id=884755 - -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA/CoRA DivisionFAX: 303-415-9702 3380 Mitchell Lane or...@cora.nwra.com Boulder, CO 80301 http://www.cora.nwra.com -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlNAH0UACgkQORnzrtFC2/tV0wCgioVNySiBQ6o05x0KQ1KqIU0C f1QAn2Xbzz/pu8ckfH1AKASrVoa2yd+a =PAAC -END PGP SIGNATURE- -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
Re: Shipping .orig files
fredagen den 4 april 2014 09.32.06 skrev Orion Poplawski: A number of rpms currently ship .orig files, which are presumably from patching the files in the spec. Would it make sense to have rpm complain about this? No, if -b is used there won't be a .orig file, unless it's named so. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
Re: Shipping .orig files
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 04/04/2014 11:44 AM, Oden Eriksson wrote: fredagen den 4 april 2014 09.32.06 skrev Orion Poplawski: A number of rpms currently ship .orig files, which are presumably from patching the files in the spec. Would it make sense to have rpm complain about this? No, if -b is used there won't be a .orig file, unless it's named so. I'm not sure when this changed, but I just did the following experiment on nodejs-less (one of the identified packages from the original message): 1) Extract tarball 2) Validate that bin/lessc is the only file in the bin/ directory 3) patch -p1 0001-Require-include-files-from-the-default-location.patch 4) Look at bin/lessc: it created a .orig file Digging much deeper, it appears that this is because my patch applied with an offset. The default behavior of patch on Fedora appears to be - --backup-if-mismatch, hence the creation of the .orig file. I'd be inclined to suggest that we may want to file a bug against redhat-rpm-macros and get the %patch macro updated to include - --no-backup-if-mismatch in rpmbuild. -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlM+/c8ACgkQeiVVYja6o6PcYACghQzfEyCwz9+6dUQsWTwZyKGu sCQAniG015yL2iJKUa7GL/7N5KdaPLee =a73t -END PGP SIGNATURE- -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct