rpms
/
cabal-rpm
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clear residual merge conflict

This commit is contained in:
Jens Petersen 2014-07-17 23:12:06 +09:00
parent b365ac1576
commit 8d61c26551
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cabal-rpm.spec
View File

@ -70,10 +70,6 @@ ln -s cblrpm-diff %{buildroot}%{_bindir}/%{name}-diff
%changelog
<<<<<<< Updated upstream
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
=======
* Thu Jul 17 2014 Jens Petersen <petersen@redhat.com> - 0.9-1
- setup logic completely reworked to make better use of existing spec file
and prep source tree for version properly
@ -85,7 +81,9 @@ ln -s cblrpm-diff %{buildroot}%{_bindir}/%{name}-diff
- improved output for 'depends' command
- use current dir name as a last guess of package name
- refactoring and improvements including no duplicate clibs deps
>>>>>>> Stashed changes
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat May 17 2014 Jens Petersen <petersen@redhat.com> - 0.8.11-1
- use .spec file to determine pkg-ver when no .cabal file around