#15 Update links
Merged a month ago by pingou. Opened a year ago by qulogic.
qulogic/r2spec link-updates  into  master

file modified
+3 -3

@@ -2,7 +2,7 @@ 

  # R2spec 

  #

  # R2spec is made to help to the creation of R specfile

- # It works from a source file (*.tar.gz) or a url (http://...*.tar.gz)

+ # It works from a source file (*.tar.gz) or a url (https://...*.tar.gz)

  #

  #

  # Made the 13th February 2008

@@ -202,10 +202,10 @@ 

  #

  # Distributed under License GPLv3 or later

  # You can find a copy of this license on the website

- # http://www.gnu.org/licenses/gpl.html

+ # https://www.gnu.org/licenses/gpl.html

  #

  # This software has been based on the guidelines for R packaging

- # http://fedoraproject.org/wiki/Packaging/R

+ # https://fedoraproject.org/wiki/Packaging:R

  #

  #***********************************************

  

file modified
+4 -4

@@ -28,7 +28,7 @@ 

  

  ** Install R2spec from the RPM **

      Get the latest RPM from

-         https://fedorahosted.org/r2spec/

+         https://pagure.io/r2spec/

  

      Run the command in the directory where your rpm file has been downloaded

          su -c'rpm -ivh R2spec-*.rpm'

@@ -39,7 +39,7 @@ 

      The simplest is then to reconstruct the RPM.

  

      Get the latest src.rpm from

-         https://fedorahosted.org/r2spec/

+         https://pagure.io/r2spec/

  

      Make sure that you have rpmbuild available and run this command if needed

          su -c'yum install rpm-build'

@@ -51,14 +51,14 @@ 

  

  ** Install R2spec from the source in a RPM-based system **

      Get the latest source from

-         https://fedorahosted.org/r2spec/

+         https://pagure.io/r2spec/

  

      Run the command in the directory where your source file has been downloaded

          rpmbuild -ta R2spec-*.tar.gz

  

  ** Install R2spec from the source using python installer **

      Get the latest source from

-         https://fedorahosted.org/r2spec/

+         https://pagure.io/r2spec/

  

      In the directory where your source file has been downloaded:

      Open the tarball

file modified
+4 -5

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

                      GNU GENERAL PUBLIC LICENSE

                         Version 3, 29 June 2007

  

-  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

+  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>

   Everyone is permitted to copy and distribute verbatim copies

   of this license document, but changing it is not allowed.

  

@@ -645,7 +645,7 @@ 

      GNU General Public License for more details.

  

      You should have received a copy of the GNU General Public License

-     along with this program.  If not, see <http://www.gnu.org/licenses/>.

+     along with this program.  If not, see <https://www.gnu.org/licenses/>.

  

  Also add information on how to contact you by electronic and paper mail.

  

@@ -664,12 +664,11 @@ 

    You should also get your employer (if you work as a programmer) or school,

  if any, to sign a "copyright disclaimer" for the program, if necessary.

  For more information on this, and how to apply and follow the GNU GPL, see

- <http://www.gnu.org/licenses/>.

+ <https://www.gnu.org/licenses/>.

  

    The GNU General Public License does not permit incorporating your program

  into proprietary programs.  If your program is a subroutine library, you

  may consider it more useful to permit linking proprietary applications with

  the library.  If this is what you want to do, use the GNU Lesser General

  Public License instead of this License.  But first, please read

- <http://www.gnu.org/philosophy/why-not-lgpl.html>.

- 

+ <https://www.gnu.org/licenses/why-not-lgpl.html>.

file modified
+2 -2

@@ -8,8 +8,8 @@ 

  

  Group:          Development/Languages

  License:        GPLv3+

- URL:            https://fedorahosted.org/r2spec/

- Source0:        https://fedorahosted.org/releases/r/2/r2spec/R2spec-%{version}.tar.gz

+ URL:            https://pagure.io/r2spec

+ Source0:        https://releases.pagure.org/r2spec/R2spec-%{version}.tar.gz

  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

  

  BuildArch:      noarch

file modified
+2 -2

@@ -1,5 +1,5 @@ 

  Name: R2spec

  Author: Pierre-Yves Chibon

  

- R2spec generates RPMs spec file for R libraries according to the R guidelines of Fedora available at http://fedoraproject.org/wiki/Packaging/R.

- It creates the spec file from an input which could be either a source file (*.tar.gz) or a url (http://*.tar.gz).

+ R2spec generates RPMs spec file for R libraries according to the R guidelines of Fedora available at https://fedoraproject.org/wiki/Packaging:R.

+ It creates the spec file from an input which could be either a source file (*.tar.gz) or a url (https://*.tar.gz).

file modified
+12 -12

@@ -1,22 +1,22 @@ 

  [repo:bioconductor]

- url = http://bioconductor.org/packages/release/bioc/html/%{packname}.html

- source = http://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz

- package = http://bioconductor.org/packages/release/bioc/src/contrib/PACKAGES

+ url = https://bioconductor.org/packages/release/bioc/html/%{packname}.html

+ source = https://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz

+ package = https://bioconductor.org/packages/release/bioc/src/contrib/PACKAGES

  

  [repo:bioconductor-annotation]

- url = http://bioconductor.org/packages/release/data/annotation/html/%{packname}.html

- source = http://bioconductor.org/packages/release/data/annotation/src/contrib/%{packname}_%{version}.tar.gz

- package = http://bioconductor.org/packages/release/data/annotation/src/contrib/PACKAGES

+ url = https://bioconductor.org/packages/release/data/annotation/html/%{packname}.html

+ source = https://bioconductor.org/packages/release/data/annotation/src/contrib/%{packname}_%{version}.tar.gz

+ package = https://bioconductor.org/packages/release/data/annotation/src/contrib/PACKAGES

  

  [repo:bioconductor-experiment]

- url = http://bioconductor.org/packages/release/data/experiment/html/%{packname}.html

- source = http://bioconductor.org/packages/release/data/experiment/src/contrib/%{packname}_%{version}.tar.gz

- package = http://bioconductor.org/packages/release/data/experiment/src/contrib/PACKAGES

+ url = https://bioconductor.org/packages/release/data/experiment/html/%{packname}.html

+ source = https://bioconductor.org/packages/release/data/experiment/src/contrib/%{packname}_%{version}.tar.gz

+ package = https://bioconductor.org/packages/release/data/experiment/src/contrib/PACKAGES

  

  [repo:cran]

- url = http://cran.r-project.org/web/packages/%{packname}/index.html

- source = http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz

- package = http://cran.r-project.org/src/contrib/PACKAGES

+ url = https://cran.r-project.org/web/packages/%{packname}/index.html

+ source = https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz

+ package = https://cran.r-project.org/src/contrib/PACKAGES

  

  [repo:r-forge]

  url = https://r-forge.r-project.org/projects/%{packname}/index.html

file modified
+2 -2

@@ -18,8 +18,8 @@ 

      maintainer = 'Pierre-Yves Chibon',

      maintainer_email = 'pingou@pingoured.fr',

      license = 'GPLv3+',

-     download_url = 'https://fedorahosted.org/releases/r/2/r2spec/',

-     url = 'https://fedorahosted.org/r2spec/',

+     download_url='https://pagure.io/r2spec/releases',

+     url='https://pagure.io/r2spec',

      package_dir = {'R2spec': 'r2spec'},

      packages = ['r2spec'],

      scripts=['R2spec', 'R2rpm'],

Replace fedorahosted.org with pagure.io and http: with https:.

I'm not a big fan of changing the LICENSE file but it looks like https://www.gnu.org/licenses/gpl-3.0.txt also uses https links now so :thumbsup:

Let's rebase and get this in :)

There are no conflicts; you don't need to wait for a rebase for most of these PRs...

rebased onto df16791

a month ago

There are no conflicts; you don't need to wait for a rebase for most of these PRs...

If I could do it myself I wouldn't be asking you ;-)

Pull-Request has been merged by pingou

a month ago

Seems like a bug in Pagure if you can't just merge any more.

Seems like a bug in Pagure if you can't just merge any more.

I can merge but not without a merge commit and I don't like merge commit, I try
to keep the history linear :)

Seems like a lot of busy-work and extra back-and-forth with so many PRs open right now, but okay.