#8 Misc specfile fixes
Merged 5 months ago by arrfab. Opened 5 months ago by dcavalca.
centos/ dcavalca/centos-packager spec  into  master

file modified
+29 -25

@@ -1,7 +1,6 @@ 

- 

  Name:           centos-packager

  Version:        0.7.0

- Release:        4%{?dist}

+ Release:        5%{?dist}

  Summary:        Tools and files necessary for building CentOS packages

  Group:          Applications/Productivity

  

@@ -15,15 +14,16 @@ 

  Requires:       rpm-build rpmdevtools rpmlint

  Requires:       mock curl openssh-clients

  Requires:       redhat-rpm-config

- Requires:				bc

- Requires:				krb5-workstation

- Requires:				openssl

+ Requires:       bc

+ Requires:       krb5-workstation

+ Requires:       openssl

  Requires:       fasjson-client python3-fasjson-client

  

  BuildArch:      noarch

  

  %description

- Tools to help set up a CentOS packaging environment

+ Tools to help set up a CentOS packaging environment and interact with the

+ Community Build System (CBS).

  

  

  %prep

@@ -33,33 +33,37 @@ 

  # Nothing here

  

  %install

- %{__mkdir_p} %{buildroot}/etc/koji.conf.d/

- %{__install} -m 0644 %{SOURCE0} %{buildroot}/etc/koji.conf.d/cbs-koji.conf

- 

- %{__mkdir_p} %{buildroot}/%{_bindir}

- ln -sf %{_bindir}/koji %{buildroot}%{_bindir}/cbs

+ mkdir -p %{buildroot}%{_sysconfdir}/koji.conf.d

+ install -m 0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/koji.conf.d/cbs-koji.conf

  

- %{__install} -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/centos-cert

+ mkdir -p %{buildroot}/%{_bindir}

+ ln -s koji %{buildroot}%{_bindir}/cbs

+ install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/centos-cert

  

  %files

  %doc COPYING

- %config /etc/koji.conf.d/cbs-koji.conf

+ %config(noreplace) %{_sysconfdir}/koji.conf.d/cbs-koji.conf

  %{_bindir}/cbs

  %{_bindir}/centos-cert

  

  %changelog

- * Wed Apr 21 2021 Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-3

+ * Fri Apr 23 2021 Davide Cavalca <dcavalca@fb.com> - 0.7.0-5

+ - Clean up macros usage

+ - Fix changelog inconsistencies and formatting

+ - Update description

+ 

+ * Wed Apr 21 2021 Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-4

  - Added openssl as Requires (missing on some fedora install)

  

- * Sat Mar 27 2021	Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-2

- - Bumped centos-cert for additional verification with CA 

+ * Sat Mar 27 2021 Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-3

+ - Bumped centos-cert for additional verification with CA

  

- * Mon Feb 1	2021 Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-2

+ * Mon Feb  1 2021 Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-2

  - Fixed the cbs call for correct profile

  

  * Thu Nov 19 2020 Fabian Arrotin <fabian.arrotin@arrfab.net> - 0.7.0-1

  - added Requires: on fasjson-client (talking to IPA and not FAS anymore)

- - replaced centos-cert script with just a wrapper around fasjson-client for TLS cert 

+ - replaced centos-cert script with just a wrapper around fasjson-client for TLS cert

  

  * Tue Aug 11 2020 Brian Stinson <bstinson@centosproject.org> - 0.6.0-1

  - Cut a new release

@@ -67,30 +71,30 @@ 

  * Wed Nov 27 2019 Jan Staněk <jstanek@redhat.com> - 0.5.5-2

  - Use Python3 on F28+ and EL 8+

  

- * Mon Nov 28 2016 brian@bstinson.com 0.5.5-1

+ * Mon Nov 28 2016 Brian Stinson <brian@bstinson.com> - 0.5.5-1

  - Update more references to ACO

  - Make sure Exception messages don't print credentials to the screen

  

- * Thu Oct 20 2016 brian@bstinson.com 0.5.4-1

+ * Thu Oct 20 2016 Brian Stinson <brian@bstinson.com> - 0.5.4-1

  - Update to point at the trust ca-bundle.crt #12110

  - Update the help text to mention ACO

  

- * Tue Oct 11 2016 brian@bstinson.com 0.5.3-1

+ * Tue Oct 11 2016 Brian Stinson <brian@bstinson.com> - 0.5.3-1

  - Rebuild to fix #12011

  

- * Tue Nov 10 2015 brian@bstinson.com 0.5.2-1

+ * Tue Nov 10 2015 Brian Stinson <brian@bstinson.com> - 0.5.2-1

  - Fix a typo pointing to the ca-bundle in the cbs koji profile

  

- * Thu Oct 29 2015 brian@bstinson.com 0.5.1-1

+ * Thu Oct 29 2015 Brian Stinson <brian@bstinson.com> - 0.5.1-1

  - Refactor to be more friendly if the http request fails

  - Move centos_cert to centos-cert

  

- * Wed Oct 28 2015 brian@bstinson.com 0.5.0-1

+ * Wed Oct 28 2015 Brian Stinson <brian@bstinson.com> - 0.5.0-1

  - The centos-cert utility now downloads the correct certificate, and sets up the

    CA certificate properly

  - Updated the koji config to point to the downloaded certificates

  

- * Sun Jul 26 2015 brian@bstinson.com 0.2.0-1

+ * Sun Jul 26 2015 Brian Stinson <brian@bstinson.com> - 0.2.0-1

  - Added the centos_cert utility

  - Remove the dep on centpkg

  - Add a dep for python-centos

Misc specfiles fixes and cleanups in preparation for submitting this to Fedora per #7

Pull-Request has been merged by arrfab

5 months ago
Metadata