Merge branch 'feature-headless' into testing

Conflicts:
	qcma.pro
This commit is contained in:
codestation
2014-04-24 23:47:29 -04:30
42 changed files with 910 additions and 251 deletions

View File

@@ -47,7 +47,8 @@ This package contains only the files necessary for development.
%prep
rm -rf $RPM_SOURCE_DIR/%{name}%{sonum}
git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/%{name}%{sonum}
%{!?_vitamtp_repo:%define _vitamtp_repo https://github.com/codestation/VitaMTP.git}
git clone "%{_vitamtp_repo}" $RPM_SOURCE_DIR/%{name}%{sonum}
cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum}
%setup -n %{name}%{sonum} -DT
@@ -61,7 +62,7 @@ make %{?_smp_mflags}
%makeinstall
rm -rf %{buildroot}/%{_libdir}/*.la
mkdir -p %{buildroot}/usr/lib/udev/rules.d
cp debian/vitamtp1.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules
cp debian/vitamtp%{sonum}.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules
%post -n %{name}%{sonum} -p /sbin/ldconfig
%postun -n %{name}%{sonum} -p /sbin/ldconfig

View File

@@ -47,7 +47,8 @@ This package contains only the files necessary for development.
%prep
rm -rf $RPM_SOURCE_DIR/%{name}%{sonum}
git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/%{name}%{sonum}
%{!?_vitamtp_repo:%define _vitamtp_repo https://github.com/codestation/VitaMTP.git}
git clone "%{_vitamtp_repo}" $RPM_SOURCE_DIR/%{name}%{sonum}
cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum}
%setup -n %{name}%{sonum} -DT
@@ -61,7 +62,7 @@ make %{?_smp_mflags}
%makeinstall
rm -rf %{buildroot}/%{_libdir}/*.la
mkdir -p %{buildroot}/usr/lib/udev/rules.d
cp debian/vitamtp1.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules
cp debian/vitamtp%{sonum}.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules
%post -n %{name}%{sonum} -p /sbin/ldconfig
%postun -n %{name}%{sonum} -p /sbin/ldconfig

View File

@@ -6,7 +6,7 @@ Name: qcma
Summary: PSVita Content Manager Assistant
License: GPL-3.0
Release: 1
Version: 0.2.9
Version: 0.3.0
URL: https://github.com/codestation/qcma
Source: https://github.com/codestation/qcma.git
Group: Productivity/File utilities
@@ -27,14 +27,15 @@ is meant to be compatible with Linux, Windows and MAC OS X.
%prep
rm -rf $RPM_SOURCE_DIR/%{name}-%{version}
git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/%{name}-%{version}
%{!?_qcma_repo:%define _qcma_repo https://github.com/codestation/qcma.git}
git clone "%{_qcma_repo}" $RPM_SOURCE_DIR/%{name}-%{version}
cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version}
%setup -n %{name}-%{version} -DT
%build
lrelease-qt5 resources/translations/*.ts
qmake-qt5 PREFIX=/usr
qmake-qt5 PREFIX=/usr qcma.pro CONFIG+=QT5_SUFFIX
make %{?_smp_mflags}
%install
@@ -43,6 +44,7 @@ make install INSTALL_ROOT=%{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/qcma
%{_bindir}/qcma_cli
%{_prefix}/share/applications/qcma/qcma.desktop
%{_prefix}/share/icons/hicolor/64x64/apps/qcma.png

View File

@@ -6,7 +6,7 @@ Name: qcma
Summary: PSVita Content Manager Assistant
License: GPL-3.0
Release: 1
Version: 0.2.9
Version: 0.3.0
URL: https://github.com/codestation/qcma
Source: https://github.com/codestation/qcma.git
Group: Productivity/File utilities
@@ -27,14 +27,15 @@ is meant to be compatible with Linux, Windows and MAC OS X.
%prep
rm -rf $RPM_SOURCE_DIR/%{name}-%{version}
git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/%{name}-%{version}
%{!?_qcma_repo:%define _qcma_repo https://github.com/codestation/qcma.git}
git clone "%{_qcma_repo}" $RPM_SOURCE_DIR/%{name}-%{version}
cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version}
%setup -n %{name}-%{version} -DT
%build
lrelease-qt5 resources/translations/*.ts
qmake-qt5 PREFIX=/usr
qmake-qt5 PREFIX=/usr qcma.pro CONFIG+=QT5_SUFFIX
make %{?_smp_mflags}
%install
@@ -43,6 +44,7 @@ make install INSTALL_ROOT=%{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/qcma
%{_bindir}/qcma_cli
%{_prefix}/share/applications/qcma/qcma.desktop
%{_prefix}/share/icons/hicolor/64x64/apps/qcma.png