diff --git a/.gitignore b/.gitignore index 016ae64..511bada 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -/vcpkg-*.tar.gz +/vcpkg-2021.08.03.tar.gz +/vcpkg-2021.08.12.tar.gz +/vcpkg-2021.09.10.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..9e01f13 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# vcpkg + +The vcpkg package diff --git a/changelog b/changelog deleted file mode 100644 index ff2f44e..0000000 --- a/changelog +++ /dev/null @@ -1,2 +0,0 @@ -* Sat Jan 27 2024 Fedora Release Engineering - 2023.06.22-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 77fef80..5d4d471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.12.16.tar.gz) = 49adbcfa37b8e349555f60a6bfcc3ba24bd1f17c69e7fd62e351f630afc3c944a535b559d2c122ec58d513cbe383408f16f6aa1f1857d7bf7a6033d0af54dcbd +SHA512 (vcpkg-2021.09.10.tar.gz) = 0bea4c7bdd91933d44a0214e2202eb5ef988826d32ae7a00a8868e510710e7de0b336b1cc6aa1ea20af2f6e24d92f2ab665046089bb4ec43bc2add94a901d5fc diff --git a/vcpkg.sh b/vcpkg.sh index fd72108..a68719f 100644 --- a/vcpkg.sh +++ b/vcpkg.sh @@ -4,8 +4,3 @@ if [ -z "$VCPKG_DISABLE_METRICS" ]; then export VCPKG_DISABLE_METRICS="1" fi - -# Export the correct vcpkg root directory. -if [ -z "$VCPKG_ROOT" ]; then - export VCPKG_ROOT="$HOME/.local/share/vcpkg" -fi diff --git a/vcpkg.spec b/vcpkg.spec index 5fb2444..9360816 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,9 +1,15 @@ +%undefine __cmake_in_source_build + +%global version_year 2021 +%global version_month 09 +%global version_day 10 + %global repo_name vcpkg-tool -%global repo_tag 2025-12-16 +%global repo_tag %{version_year}-%{version_month}-%{version_day} Name: vcpkg -Version: %(echo %{repo_tag} | sed 's/-/./g') -Release: %autorelease +Version: %{version_year}.%{version_month}.%{version_day} +Release: 1%{?dist} License: MIT Summary: C++ Library Manager @@ -11,55 +17,23 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -%if 0%{?fedora} && 0%{?fedora} >= 42 -ExcludeArch: %{ix86} -%endif - -BuildRequires: catch-devel >= 2.13.0 +BuildRequires: catch-devel BuildRequires: cmake -BuildRequires: cmrc-devel -BuildRequires: fmt-devel >= 11.0.0 BuildRequires: gcc-c++ BuildRequires: ninja-build -Requires: cmake%{?_isa} -Requires: curl%{?_isa} -Requires: gcc-c++%{?_isa} -Requires: git-core%{?_isa} -Requires: ninja-build%{?_isa} - -Recommends: aria2%{?_isa} - %description Vcpkg is a package manager for the different C and C++ libraries. Vcpkg can collect usage data. The data collected by Microsoft is anonymous. -This package has telemetry disabled by default and doesn't ship the -repository with recipes. - -Please read README.fedora file for more information. +Fedora package has telemetry disabled by default. If you want to enable +telemetry, you should remove the %{_sysconfdir}/profile.d/%{name}.sh file +or unset the VCPKG_DISABLE_METRICS environment variable. %prep %autosetup -n %{repo_name}-%{repo_tag} -p1 -# Adding a file with some useful information... -cat << EOF >> README.fedora -Fedora package has telemetry disabled by default. If you want to enable -it, you should unset the VCPKG_DISABLE_METRICS environment variable -from the %{_sysconfdir}/profile.d/%{name}.sh file. - -Fedora can't ship the official Git repository with recipes for various -reasons (especially legal), so you'll need to manually clone it into -the \$HOME/.local/share/%{name} directory (the path can be changed in -the %{_sysconfdir}/profile.d/%{name}.sh file): -git clone https://github.com/microsoft/%{name}.git \$VCPKG_ROOT - -You will have to update it manually too: -git -C \$VCPKG_ROOT pull -EOF - # Fixing line endings... sed -e "s,\r,," -i README.md @@ -72,12 +46,8 @@ ln -svf %{_includedir}/catch2/ include/ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ - -DVCPKG_BASE_VERSION:STRING="%{repo_tag}" \ - -DVCPKG_VERSION:STRING="%{release}" \ -DVCPKG_DEVELOPMENT_WARNINGS:BOOL=OFF \ -DVCPKG_WARNINGS_AS_ERRORS:BOOL=OFF \ - -DVCPKG_DEPENDENCY_CMAKERC:BOOL=ON \ - -DVCPKG_DEPENDENCY_EXTERNAL_FMT:BOOL=ON \ -DVCPKG_BUILD_TLS12_DOWNLOADER:BOOL=OFF \ -DVCPKG_BUILD_FUZZING:BOOL=OFF \ -DVCPKG_EMBED_GIT_SHA:BOOL=OFF \ @@ -92,10 +62,20 @@ ln -svf %{_includedir}/catch2/ include/ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name}.sh" %files -%doc README.md README.fedora +%doc README.md %license LICENSE.txt NOTICE.txt %{_bindir}/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog -%autochangelog +* Sun Sep 12 2021 Vitaly Zaitsev - 2021.09.10-1 +- Updated to version 2021.09.10. + +* Tue Aug 17 2021 Vitaly Zaitsev - 2021.08.12-1 +- Updated to version 2021.08.12. + +* Wed Aug 04 2021 Vitaly Zaitsev - 2021.08.03-1 +- Updated to version 2021.08.03. + +* Sun Jul 25 2021 Vitaly Zaitsev - 2021.07.21-1 +- Initial SPEC release.