rpms/sword
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix remaining merge code

Browse Source
This commit is contained in:
Gregory Hellings 2020-12-14 23:54:43 -06:00
parent 248daffc9b
commit 1bdf78c2ce
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sword.spec
View File

@ -91,14 +91,8 @@ Perl bindings for The SWORD Library.
-DLIBSWORD_SOVERSION=%{soversion} \ -DLIBSWORD_SOVERSION=%{soversion} \
-DLIBDIR=%{_libdir} \ -DLIBDIR=%{_libdir} \
-DSWORD_BUILD_TESTS=Yes \ -DSWORD_BUILD_TESTS=Yes \
<<<<<<< HEAD
-DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" \
.. -B .
make %{?_smp_mflags}
=======
-DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}"
%cmake_build %cmake_build
>>>>>>> master
%install %install
%cmake_install %cmake_install
@ -164,12 +158,12 @@ make tests
* Fri Oct 2 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.903-1 * Fri Oct 2 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.903-1
- Upstream 1.9.0RC3 release - Upstream 1.9.0RC3 release
* Fri Sep 11 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.901-1
- Upstream 1.9.0RC1 release
* Thu Oct 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.1-25 * Thu Oct 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.1-25
- Make the package build with updated %%cmake macro (#1865556) - Make the package build with updated %%cmake macro (#1865556)
* Fri Sep 11 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.901-1
- Upstream 1.9.0RC1 release
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-24 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-24
- Second attempt - Rebuilt for - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild