Skip to content

Commit

Permalink
merge yumex-dnf-4.3.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Lauridsen committed Apr 26, 2016
2 parents 4056aa7 + d5b548d commit 3715271
Show file tree
Hide file tree
Showing 11 changed files with 600 additions and 348 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ __pycache__/
/po/*.mo
*~
/docs/_*
/build/
126 changes: 126 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,129 @@
2016-04-26 Tim Lauridsen <[email protected]>

* setup.py, src/yumex/const.py, yumex-dnf.spec: bumped version to
4.3.2

2016-04-26 Tim Lauridsen <[email protected]>

Merge pull request #99 from genodeftest/devel-paned Fix main
GtkPaned being to small

2016-04-26 Tim Lauridsen <[email protected]>

Merge pull request #100 from genodeftest/devel-transactiondialog
Fix transaction dialog not expanding properly

2016-04-26 Christian Stadelmann <[email protected]>

* src/yumex.ui: Fix transaction dialog not expanding properly

2016-04-26 Christian Stadelmann <[email protected]>

* src/yumex.ui: Fix main GtkPaned being to small Without this fix,
the GtkPaned could be resized in a way that one of its child widgets
partially or completely got hidden.

2015-12-17 Tim Lauridsen <[email protected]>

* src/yumex/gui/widgets.py: Extra filter popover should default
positon to bottom

2015-12-17 Tim Lauridsen <[email protected]>

* src/yumex/gui/widgets.py: make fields sensitive if search type is
fields

2015-12-17 Tim Lauridsen <[email protected]>

* src/yumex.ui, src/yumex/__init__.py, src/yumex/gui/widgets.py:
move extra filters to headerbar

2015-12-16 Tim Lauridsen <[email protected]>

* src/yumex.ui: change the icon of Extra filters button

2015-12-15 Tim Lauridsen <[email protected]>

* Makefile: build: use a relative build dir

2015-12-15 Tim Lauridsen <[email protected]>

* src/yumex/__init__.py, src/yumex/gui/widgets.py: Add **Refresh
Metadata** to main menu (#84)

2015-12-15 Tim Lauridsen <[email protected]>

* .gitignore: update .gitignore to dont include build/

2015-12-15 Tim Lauridsen <[email protected]>

* README.md: update README

2015-12-15 Tim Lauridsen <[email protected]>

* Makefile: build rpms in source tree ($pwd/build)

2015-12-15 Tim Lauridsen <[email protected]>

* src/yumex/__init__.py, src/yumex/gui/widgets.py: Added keyboard
shortcut Alt-X to Extra filters (#14)

2015-12-15 Tim Lauridsen <[email protected]>

Add reworked option and extra filters (#85)

2015-12-15 Tim Lauridsen <[email protected]>

* src/yumex.ui, src/yumex/__init__.py, src/yumex/gui/views.py,
src/yumex/gui/widgets.py: Add Extra Filters menu with archs and
package version filters (#85)

2015-12-14 Tim Lauridsen <[email protected]>

* src/yumex/__init__.py: show gui before the need to setup the
backend (#88)

2015-12-11 Tim Lauridsen <[email protected]>

* src/yumex.ui, src/yumex/__init__.py: add action handler

2015-12-11 Tim Lauridsen <[email protected]>

* src/yumex.ui: add button for more filters

2015-12-11 Tim Lauridsen <[email protected]>

* src/yumex.ui, src/yumex/__init__.py, src/yumex/gui/widgets.py:
Remove options from main menu

2015-12-11 Tim Lauridsen <[email protected]>

* src/yumex.ui: Added new preferences dialog

2015-12-10 Tim Lauridsen <[email protected]>

* Makefile: change Makefile for new release workflow

2015-12-09 Tim Lauridsen <[email protected]>

* src/yumex.ui: minor ui adjustment

2015-12-09 Tim Lauridsen <[email protected]>

* src/yumex/__init__.py: make search button insensitive, don't hide
(#74)

2015-12-09 Tim Lauridsen <[email protected]>

* src/yumex.ui: UI adjustments (#74) * Renamed 'Pending Action' to
'Queue' in headerbar * Added comments for translators for headerbar
page buttons * Removed space between searchbar and search options
button.

2015-12-09 Tim Lauridsen <[email protected]>

* ChangeLog: updated ChangeLog

2015-12-09 Tim Lauridsen <[email protected]>

* setup.py, src/yumex/const.py, yumex-dnf.spec: bumped version to
Expand Down
26 changes: 19 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ BUMPED_MINOR=${shell VN=`cat ${APPNAME}.spec | grep Version| sed 's/${VER_REGEX
NEW_VER=${shell cat ${APPNAME}.spec | grep Version| sed 's/\(^Version:\s*\)\([0-9]*\.[0-9]*\.\)\(.*\)/\2${BUMPED_MINOR}/'}
NEW_REL=0.1.${GITDATE}
DIST=${shell rpm --eval "%{dist}"}
GIT_MASTER=master
GIT_MASTER=develop
CURDIR = ${shell pwd}
BUILDDIR= $(CURDIR)/build

all: build

Expand All @@ -35,16 +37,18 @@ clean: $(CLEAN_TARGETS)
-rm -f *.tar.gz
-rm -rf build
-rm -rf dist


get-builddeps:
@sudo dnf install python3-devel python3-gobject perl-TimeDate gettext intltool transifex-client

archive:
@rm -rf ${APPNAME}-${VERSION}.tar.gz
@git archive --format=tar --prefix=$(APPNAME)-$(VERSION)/ HEAD | gzip -9v >${APPNAME}-$(VERSION).tar.gz
@cp ${APPNAME}-$(VERSION).tar.gz $(shell rpm -E '%_sourcedir')
@mkdir -p ${BUILDDIR}/SOURCES
@cp ${APPNAME}-$(VERSION).tar.gz ${BUILDDIR}/SOURCES
@rm -rf ${APPNAME}-${VERSION}.tar.gz
@echo "The archive is in ${APPNAME}-$(VERSION).tar.gz"
@echo "The archive is in ${BUILDDIR}/SOURCES/${APPNAME}-$(VERSION).tar.gz"

# needs perl-TimeDate for git2cl
changelog:
Expand All @@ -53,16 +57,24 @@ changelog:
upload:
@scp ~/rpmbuild/SOURCES/${APPNAME}-${VERSION}.tar.gz yum-extender.org:public_html/dnl/yumex/source/.

release:
release-branch:
@git branch -m ${GIT_MASTER} release-${VERSION}

release-publish:
@git checkout release-${VERSION}
@git commit -a -m "bumped version to $(VERSION)"
@$(MAKE) changelog
@git commit -a -m "updated ChangeLog"
@git push
@git checkout release-devel
@git merge --no-ff release-${VERSION} -m "merge ${APPNAME}-${VERSION} release"
@git tag -f -m "Added ${APPNAME}-${VERSION} release tag" ${APPNAME}-${VERSION}
@git push --tags origin
@$(MAKE) archive
@$(MAKE) rpm

release-cleanup:
@git branch -D release-${VERSION}

test-cleanup:
@rm -rf ${APPNAME}-${VERSION}.test.tar.gz
@echo "Cleanup the git release-test local branch"
Expand All @@ -87,12 +99,12 @@ test-release:
@rm -rf ${APPNAME}-${NEW_VER}.tar.gz
@git archive --format=tar --prefix=$(APPNAME)-$(NEW_VER)/ HEAD | gzip -9v >${APPNAME}-$(NEW_VER).tar.gz
# Build RPMS
@-rpmbuild -ta ${APPNAME}-${NEW_VER}.tar.gz
@-rpmbuild --define '_topdir $(BUILDDIR)' -ta ${APPNAME}-${NEW_VER}.tar.gz
@$(MAKE) test-cleanup

rpm:
@$(MAKE) archive
@rpmbuild -ba $(APPNAME).spec
@rpmbuild --define '_topdir $(BUILDDIR)' -ta ${BUILDDIR}/SOURCES/${APPNAME}-$(VERSION).tar.gz

test-builds:
@$(MAKE) test-release
Expand Down
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Requirements
dnf install python3 python3-gobject
```

[dnf-deamon](https://github.com/timlau/dnf-daemon) must also be installed.
[dnf-deamon](https://github.com/timlau/dnf-daemon) python3 bindings must also be installed.

```
dnf install dnfdaemon
dnf install python3-dnfdaemon
```

Or build the latest version from git
Expand All @@ -38,9 +38,19 @@ make test-inst

Fedora Repository
=======================
yumex-dnf is available in the Fedora repositories for f21, f22 & Rawhide
yumex-dnf is available in the Fedora repositories for f22, f23 & Rawhide

Use this to install it.
```
sudo dnf install yumex-dnf
```

Fedora Copr Repository
=======================
yumex-dnf & dnddaemon development packages is available in a [fedora Copr repository](https://copr.fedoraproject.org/coprs/timlau/yumex-dnf/) for f22, f23 & Rawhide


Use this to enable it.
```
sudo dnf copr enable timlau/yumex-dnf
```
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def run(self):
os.rename(outfile, newfile)

setup(name="yumex-dnf",
version="4.3.1",
version="4.3.2",
description="Graphical package management tool",
long_description="",
author="Tim Lauridsen",
Expand Down
Loading

0 comments on commit 3715271

Please sign in to comment.