scm-commits October 2017

scm-commits@lists.fedoraproject.org

1 participants
14460 discussions

dchen pushed to zanata-platform (f25). "- Upstream update to 4.3.0"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From c6505c0e883ff9c76978c33ea51770c7c86a8bc9 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen <dchen(a)redhat.com> Date: Oct 20 2017 15:14:09 +0000 Subject: - Upstream update to 4.3.0 --- diff --git a/.gitignore b/.gitignore index ea92f3b..1d7822a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /platform-4.1.1.zip /platform-4.2.1.zip +/platform-4.3.0.zip diff --git a/sources b/sources index 4c0683c..c456b6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (platform-4.2.1.zip) = 33f3d079e4847372a604333f6d9377e41a32c443ebb9b3213055096e26c930f8faece0496717503c79ddc277a2c3422f8c8476a25048c07b6b7cdd43e49a0d42 +SHA512 (platform-4.3.0.zip) = 984d9a96f61ef42bc787f8f97a5ceed592989878d55aa3b8a868acdc739845fc0899b143933d63457d6bfbd4160d079a0cb506921c0d08081015c7780c2840bb diff --git a/zanata-platform.spec b/zanata-platform.spec index 72c861a..da0ae2c 100644 --- a/zanata-platform.spec +++ b/zanata-platform.spec @@ -1,9 +1,10 @@ %global findbugs_ver_min 3.0.0 +%global findbugs_version %(rpm -q --qf "%%{version}" findbugs) %global javac_source_ver 1.8 %global java_ver_min %{javac_source_ver}.0 -%global jersey_ver_min 1.17 +%global jsr305_maven_name mvn(com.google.code.findbugs:jsr305) +%global jsr305_maven_version %(rpm -q --whatprovides "%{jsr305_maven_name}" --provides | sed -n -e 's/%{jsr305_maven_name} = //p') %global resteasy_ver_min 3.0.6 -%global findbugs_version %(rpm -q --qf "%%{version}" findbugs) %global resteasy_version %(rpm -q --qf "%%{version}" resteasy-core) %global simpleframework_version %(rpm -q --qf "%%{version}" simple) %global client_sub_modules zanata-rest-client zanata-client-commands zanata-cli @@ -11,8 +12,8 @@ %global mvn_build_opts -e -T 1 -DskipUnitTest=true -DskipTests=true -DskipFuncTests=true -DskipArqTests=true dependency:build-classpath -Dmdep.analyze.skip=true -DfailIfNoTests=false -DincludeScope=compile -Dmdep.outputFile=classpath.txt -Prelease Name: zanata-platform -Version: 4.2.1 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: Zanata the web-based translation platform Group: Development/Tools @@ -33,6 +34,7 @@ BuildRequires: findbugs >= %{findbugs_ver_min} BuildRequires: jetty-servlet BuildRequires: jetty-servlets BuildRequires: jgettext +BuildRequires: jsr-305 BuildRequires: maven-dependency-plugin BuildRequires: mvn(com.sun:tools) BuildRequires: mvn(com.google.guava:guava) @@ -129,6 +131,12 @@ rm -f parent/intellij-code-style-settings.jar ## Single Thread compile sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config +## remove SupressFBWarnings, because Fedora does not have edu.umd.cs.findbugs.annotations.SuppressFBWarnings +for jSrc in $( grep -R -l edu.umd.cs --include '*.java' * ); do + sed -i.FBWarnings -e 's/^.*edu.umd.cs.findbugs.annotations.SuppressFBWarnings.*$//' $jSrc + sed -i -e 's/(a)SuppressFBWarnings.*$//' $jSrc +done + %pom_xpath_set "pom:parent/pom:relativePath" "parent/pom.xml" %mvn_artifact pom.xml @@ -138,11 +146,13 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config %pom_remove_plugin :maven-surefire-plugin build-tools %pom_remove_dep com.lesfurets:jenkins-pipeline-unit build-tools %pom_remove_dep org.assertj:assertj-core build-tools - +rm -fr build-tools/src/test/java/TestJenkinsfile.java ## parent +%pom_remove_dep com.google.code.findbugs:findbugs-annotations parent %pom_remove_dep org.jboss.resteasy:resteasy-bom parent %pom_remove_plugin :animal-sniffer-maven-plugin parent +%pom_remove_plugin :restrict-maven-plugin parent %pom_remove_plugin :duplicate-finder-maven-plugin parent %pom_remove_plugin :findbugs-maven-plugin parent %pom_remove_plugin :gitdescribe-maven-plugin parent @@ -170,11 +180,12 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config %mvn_artifact parent/pom.xml ## api -%pom_remove_plugin :findbugs-maven-plugin api +#%pom_remove_plugin :findbugs-maven-plugin api %pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" api %mvn_artifact api/pom.xml ## zanata-common-api +%pom_remove_dep com.google.code.findbugs:findbugs-annotations api/zanata-common-api %pom_remove_plugin :enunciate-slim-maven-plugin api/zanata-common-api %pom_remove_plugin :gmaven-plugin api/zanata-common-api %pom_remove_plugin :maven-enforcer-plugin api/zanata-common-api @@ -182,7 +193,7 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec api/zanata-common-api # We use the existing findbugs in fedora -%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" api/zanata-common-api +%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided api/zanata-common-api %pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='resteasy-multipart-provider']" "<version>%{resteasy_version}</version>" api/zanata-common-api # delete enunciate stuff @@ -197,8 +208,12 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service %mvn_artifact api/zanata-common-api/pom.xml api/zanata-common-api/target/zanata-common-api-%{version}.jar ## common -%pom_remove_plugin :findbugs-maven-plugin common -%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" common +#%pom_remove_dep '${project.groupId}:zanata-common-api' common +#%pom_remove_plugin :findbugs-maven-plugin common +%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-adapter-glossary +%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-adapter-xliff +%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-common-util +%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided common %pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" common %mvn_artifact common/pom.xml %mvn_artifact common/zanata-adapter-po/pom.xml common/zanata-adapter-po/target/zanata-adapter-po-%{version}.jar @@ -207,15 +222,19 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service %mvn_artifact common/zanata-adapter-glossary/pom.xml common/zanata-adapter-glossary/target/zanata-adapter-glossary-%{version}.jar %mvn_artifact common/zanata-adapter-xliff/pom.xml common/zanata-adapter-xliff/target/zanata-adapter-xliff-%{version}.jar + +## common/zanata-common-util + ## client %mvn_package ":zanata-{rest-client,client-commands,cli}" zanata-client %mvn_package ":client,stub-server" zanata-client -%pom_remove_plugin :findbugs-maven-plugin client +#%pom_remove_plugin :findbugs-maven-plugin client %pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} client -%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client +#%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client # Ensure it compile with supported java version -%pom_xpath_inject "pom:plugins" "<plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>" client +%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin client "<configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration>" +#%pom_xpath_inject "pom:plugins" "<plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>" client %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:version" %{simpleframework_version} client @@ -223,6 +242,8 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service %mvn_artifact client/pom.xml ## stub-server +%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/stub-server +#%pom_remove_dep com.google.code.findbugs:jsr305 client/stub-server %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/stub-server %pom_remove_dep org.scannotation:scannotation client/stub-server %pom_remove_plugin :duplicate-finder-maven-plugin client/stub-server @@ -230,12 +251,20 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service ## rest rm -fr client/zanata-rest-client/src/test +## remove the test dependency +%pom_remove_dep org.zanata:stub-server client/zanata-rest-client +%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-rest-client +%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-rest-client +%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client/zanata-rest-client %pom_remove_plugin :duplicate-finder-maven-plugin client/zanata-rest-client %mvn_artifact client/zanata-rest-client/pom.xml client/zanata-rest-client/target/zanata-rest-client-%{version}.jar ## command +%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-client-commands +#%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-client-commands %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/zanata-client-commands +#%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided client/zanata-common-commands %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client/zanata-client-commands rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/*.java @@ -244,14 +273,19 @@ rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/* rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/*.java %mvn_artifact client/zanata-client-commands/pom.xml client/zanata-client-commands/target/zanata-client-commands-%{version}.jar +## remove SupressFBWarnings, because Fedora does not have edu.umd.cs.findbugs.annotations.SuppressFBWarnings +sed -i -e 's/import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;.*$//' client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java +sed -i -e 's/(a)SuppressFBWarnings.*$//' client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java ## cli ## No need to generate tarball, thus remove assembly-plugin +%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-cli +#%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-cli %pom_remove_plugin :appassembler-maven-plugin client/zanata-cli %pom_remove_plugin :maven-assembly-plugin client/zanata-cli %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client/zanata-cli -%pom_xpath_inject "pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions" "<exclusion><groupId>com.sun</groupId><artifactId>tools</artifactId></exclusion>" client/zanata-cli +#%pom_xpath_inject "pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions" "<exclusion><groupId>com.sun</groupId><artifactId>tools</artifactId></exclusion>" client/zanata-cli ## simple-6.0.1 does not have org.simpleframework.http.core.ContainerServer.class rm client/zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java @@ -271,11 +305,10 @@ rm client/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java %build # Don't install here, it seems takari produces many duplicates in xmvn-reactor # Skip the test compile for build tools to avoid Jenkinsfile unit tests -%mvn_build -i -j -G -- %{mvn_build_opts} -Dmaven.test.skip -pl build-tools - +#%mvn_build -i -G -- %{mvn_build_opts} -Dmaven.test.skip -pl build-tools,parent,api,api/zanata-common-api # Build the rest with unit tests, for it is used to build command lines -%mvn_build -i -G -- %{mvn_build_opts} -pl '!build-tools' -#%mvn_build -i -G -- %{mvn_build_opts} +#%mvn_build -i -G -- %{mvn_build_opts} -pl '!build-tools,!parent,!api,!api/zanata-common-api' +%mvn_build -i -G -- %{mvn_build_opts} %install @@ -321,16 +354,22 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli ################################################################# %files -f .mfiles -%doc README.md docs/release-notes.md -%license LICENSE.txt LICENSE.LESSER.txt +%doc README.md docs/release-notes.md CONTRIBUTING.md +%license license.md license-gpl.md %files javadoc -f .mfiles-javadoc %files -n zanata-client -f .mfiles-zanata-client %{_bindir}/zanata-cli -%doc client/README.txt docs/client/index.md docs/client/configuration.md docs/client/command-hook.md +%doc client/README.md docs/client/index.md docs/client/configuration.md docs/client/command-hook.md %changelog +* Wed Oct 18 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.3.0-1 +- Upstream update to 4.3.0 + +* Mon Sep 04 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.4-1 +- Upstream update to 4.2.4 + * Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild https://src.fedoraproject.org/rpms/zanata-platform/c/c6505c0e883ff9c76978c3…

1 0

dchen pushed to zanata-platform (f26). "- Upstream update to 4.3.0"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

1 0

dchen pushed to zanata-platform (f26). "fix the build"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 305e31f9df9422d17a75ccb1dc9f8edc0cc50769 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen <dchen(a)redhat.com> Date: Oct 31 2017 14:42:36 +0000 Subject: fix the build --- diff --git a/zanata-platform-4.2.1-mvn-extensions.patch b/zanata-platform-4.2.1-mvn-extensions.patch deleted file mode 100644 index aaabd2a..0000000 --- a/zanata-platform-4.2.1-mvn-extensions.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up ./.mvn/extensions.xml.mvn-extensions ./.mvn/extensions.xml ---- ./.mvn/extensions.xml.mvn-extensions 2017-02-24 15:13:24.000000000 +1000 -+++ ./.mvn/extensions.xml 2017-03-03 00:30:41.150070899 +1000 -@@ -34,9 +34,11 @@ - NB: may give odd timings when running multi-threaded - builds with mvn's -T option, eg smart builder. - --> -+  - </extensions> diff --git a/zanata-platform-4.3.0-mvn-extensions.patch b/zanata-platform-4.3.0-mvn-extensions.patch new file mode 100644 index 0000000..b1bfa78 --- /dev/null +++ b/zanata-platform-4.3.0-mvn-extensions.patch @@ -0,0 +1,12 @@ +diff -up ./zanata-platform-platform-4.3.0/.mvn/extensions.xml.mvn-extensions ./zanata-platform-platform-4.3.0/.mvn/extensions.xml +--- ./zanata-platform-platform-4.3.0/.mvn/extensions.xml.mvn-extensions 2017-10-08 23:18:05.000000000 +1000 ++++ ./zanata-platform-platform-4.3.0/.mvn/extensions.xml 2017-10-30 18:02:56.181060090 +1000 +@@ -21,7 +21,7 @@ + <extension> + <groupId>io.takari.maven</groupId> + <artifactId>takari-smart-builder</artifactId> +- <version>0.5.0</version> ++ <version>0.6.1</version> + </extension> +  + <extension> diff --git a/zanata-platform.spec b/zanata-platform.spec index da0ae2c..5341272 100644 --- a/zanata-platform.spec +++ b/zanata-platform.spec @@ -3,9 +3,11 @@ %global javac_source_ver 1.8 %global java_ver_min %{javac_source_ver}.0 %global jsr305_maven_name mvn(com.google.code.findbugs:jsr305) -%global jsr305_maven_version %(rpm -q --whatprovides "%{jsr305_maven_name}" --provides | sed -n -e 's/%{jsr305_maven_name} = //p') +%global jsr305_maven_version %(rpm -q --qf "%%{version}" --whatprovides "%{jsr305_maven_name}") %global resteasy_ver_min 3.0.6 %global resteasy_version %(rpm -q --qf "%%{version}" resteasy-core) +%global takari_smart_builder_version %(rpm -q --qf "%%{version}" takari-smart-builder) +%global takari_lifecycle_version %(rpm -q --qf "%%{version}" takari-lifecycle) %global simpleframework_version %(rpm -q --qf "%%{version}" simple) %global client_sub_modules zanata-rest-client zanata-client-commands zanata-cli %global client_command_name zanata-cli @@ -20,7 +22,7 @@ Group: Development/Tools License: LGPLv2+ URL: https://github.com/zanata/%{name} Source0: https://github.com/zanata/%{name}/archive/platform-%{version}.zip -Patch0: %{name}-4.2.1-mvn-extensions.patch +Patch0: %{name}-4.3.0-mvn-extensions.patch BuildArch: noarch @@ -37,6 +39,7 @@ BuildRequires: jgettext BuildRequires: jsr-305 BuildRequires: maven-dependency-plugin BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(io.takari.aether:aether-connector-okhttp) BuildRequires: mvn(javax.validation:validation-api) @@ -57,6 +60,7 @@ BuildRequires: mvn(org.hibernate:hibernate-validator) BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.resteasy:jaxrs-api) BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.scannotation:scannotation) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: openprops BuildRequires: powermock-api-mockito @@ -67,8 +71,8 @@ BuildRequires: simple BuildRequires: slf4j BuildRequires: slf4j-log4j12 BuildRequires: spock-core -BuildRequires: takari-lifecycle -BuildRequires: takari-smart-builder +#BuildRequires: takari-lifecycle +#BuildRequires: takari-smart-builder BuildRequires: xom Requires: java-headless >= 1:%{java_ver_min} Requires: apache-commons-csv @@ -122,7 +126,7 @@ It also contains REST stub for interacting with a Zanata server. %prep %setup -q -n %{name}-platform-%{version} -%patch0 -b .mvn-extensions -p0 +%patch0 -b .mvn-extensions -p2 ## Remove .jar files in source rm -f .mvn/wrapper/maven-wrapper.jar @@ -130,6 +134,8 @@ rm -f parent/intellij-code-style-settings.jar ## Single Thread compile sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config +sed -i -e 's/--builder .*/--builder singlethreaded/' .mvn/maven.config +#sed -i -e 's/--builder .*/--builder multithreaded/' .mvn/maven.config ## remove SupressFBWarnings, because Fedora does not have edu.umd.cs.findbugs.annotations.SuppressFBWarnings for jSrc in $( grep -R -l edu.umd.cs --include '*.java' * ); do @@ -137,11 +143,20 @@ for jSrc in $( grep -R -l edu.umd.cs --include '*.java' * ); do sed -i -e 's/(a)SuppressFBWarnings.*$//' $jSrc done +## Global +%pom_remove_dep -r com.google.code.findbugs:findbugs-annotations +%pom_remove_plugin -r :findbugs-maven-plugin parent +%pom_remove_plugin -r :maven-enforcer-plugin parent +%pom_remove_plugin -r :takari-lifecycle-plugin + +## root %pom_xpath_set "pom:parent/pom:relativePath" "parent/pom.xml" %mvn_artifact pom.xml ## build-tools %mvn_artifact build-tools/pom.xml +%pom_xpath_set "pom:packaging" "jar" build-tools + %pom_xpath_remove "pom:profiles/pom:profile[pom:id='release']/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-gpg-plugin']" build-tools %pom_remove_plugin :maven-surefire-plugin build-tools %pom_remove_dep com.lesfurets:jenkins-pipeline-unit build-tools @@ -149,17 +164,15 @@ done rm -fr build-tools/src/test/java/TestJenkinsfile.java ## parent -%pom_remove_dep com.google.code.findbugs:findbugs-annotations parent -%pom_remove_dep org.jboss.resteasy:resteasy-bom parent +%mvn_artifact parent/pom.xml %pom_remove_plugin :animal-sniffer-maven-plugin parent %pom_remove_plugin :restrict-maven-plugin parent %pom_remove_plugin :duplicate-finder-maven-plugin parent -%pom_remove_plugin :findbugs-maven-plugin parent %pom_remove_plugin :gitdescribe-maven-plugin parent %pom_remove_plugin :jacoco-maven-plugin parent +%pom_remove_plugin :maven-antrun-plugin parent %pom_remove_plugin :maven-checkstyle-plugin parent %pom_remove_plugin :maven-eclipse-plugin parent -%pom_remove_plugin :maven-enforcer-plugin parent %pom_remove_plugin :maven-release-plugin parent %pom_remove_plugin :maven-sortpom-plugin parent %pom_remove_plugin :maven-source-plugin parent @@ -167,104 +180,104 @@ rm -fr build-tools/src/test/java/TestJenkinsfile.java %pom_remove_plugin :versions-maven-plugin parent %pom_xpath_remove "pom:profiles/pom:profile[pom:id='release']/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-gpg-plugin']" parent %pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions" "<execution><id>aggregate</id><goals><goal>aggregate</goal></goals><phase>prepare-package</phase></execution>" parent - - -# Takari plugin -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='takari-lifecycle-plugin']/pom:dependencies" parent +%pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} parent %pom_xpath_remove "pom:build/pom:extensions" parent -%pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} parent -%pom_xpath_inject "pom:properties" "<gitDescribe>%{version}</gitDescribe>" parent +%pom_xpath_remove "pom:properties/pom:maven.compiler.compilerId" parent +%pom_xpath_inject "pom:properties" "<gitDescribe>%{version}</gitDescribe>" parent -%mvn_artifact parent/pom.xml ## api -#%pom_remove_plugin :findbugs-maven-plugin api %pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" api %mvn_artifact api/pom.xml ## zanata-common-api -%pom_remove_dep com.google.code.findbugs:findbugs-annotations api/zanata-common-api +%mvn_artifact api/zanata-common-api/pom.xml api/zanata-common-api/target/zanata-common-api-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" api/zanata-common-api + %pom_remove_plugin :enunciate-slim-maven-plugin api/zanata-common-api %pom_remove_plugin :gmaven-plugin api/zanata-common-api -%pom_remove_plugin :maven-enforcer-plugin api/zanata-common-api %pom_remove_plugin :maven-shade-plugin api/zanata-common-api %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec api/zanata-common-api -# We use the existing findbugs in fedora -%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided api/zanata-common-api %pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='resteasy-multipart-provider']" "<version>%{resteasy_version}</version>" api/zanata-common-api # delete enunciate stuff rm -rf zanata-common-api/src/test/java/org/zanata/rest/enunciate -rm -rf zanata-common-api/src/test/java/org/zanata/rest/dto/ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service # remove groovy-all and spock %pom_remove_dep org.codehaus.groovy:groovy-all api/zanata-common-api %pom_remove_dep org.spockframework:spock-core api/zanata-common-api -%mvn_artifact api/zanata-common-api/pom.xml api/zanata-common-api/target/zanata-common-api-%{version}.jar ## common -#%pom_remove_dep '${project.groupId}:zanata-common-api' common -#%pom_remove_plugin :findbugs-maven-plugin common -%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-adapter-glossary -%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-adapter-xliff -%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-common-util -%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided common %pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" common %mvn_artifact common/pom.xml + +%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided common + +## common/zanata-common-util +%mvn_artifact common/zanata-common-util/pom.xml common/zanata-common-util/target/zanata-common-util-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" common/zanata-common-util + +%pom_xpath_inject "pom:parent" "<relativePath>../pom.xml</relativePath>" common/zanata-common-util + +## common/zanata-adapters %mvn_artifact common/zanata-adapter-po/pom.xml common/zanata-adapter-po/target/zanata-adapter-po-%{version}.jar %mvn_artifact common/zanata-adapter-properties/pom.xml common/zanata-adapter-properties/target/zanata-adapter-properties-%{version}.jar -%mvn_artifact common/zanata-common-util/pom.xml common/zanata-common-util/target/zanata-common-util-%{version}.jar %mvn_artifact common/zanata-adapter-glossary/pom.xml common/zanata-adapter-glossary/target/zanata-adapter-glossary-%{version}.jar %mvn_artifact common/zanata-adapter-xliff/pom.xml common/zanata-adapter-xliff/target/zanata-adapter-xliff-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-po +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-properties +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-glossary +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-xliff -## common/zanata-common-util - ## client +%pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" client +%mvn_artifact client/pom.xml %mvn_package ":zanata-{rest-client,client-commands,cli}" zanata-client %mvn_package ":client,stub-server" zanata-client -#%pom_remove_plugin :findbugs-maven-plugin client + + %pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} client #%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client # Ensure it compile with supported java version %pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin client "<configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration>" -#%pom_xpath_inject "pom:plugins" "<plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>" client %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:version" %{simpleframework_version} client -%pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" client -%mvn_artifact client/pom.xml ## stub-server -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/stub-server -#%pom_remove_dep com.google.code.findbugs:jsr305 client/stub-server +%mvn_artifact client/stub-server/pom.xml client/stub-server/target/stub-server-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/stub-server + %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/stub-server %pom_remove_dep org.scannotation:scannotation client/stub-server %pom_remove_plugin :duplicate-finder-maven-plugin client/stub-server %pom_remove_plugin :maven-surefire-plugin client/stub-server ## rest +%mvn_artifact client/zanata-rest-client/pom.xml client/zanata-rest-client/target/zanata-rest-client-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/zanata-rest-client + rm -fr client/zanata-rest-client/src/test ## remove the test dependency -%pom_remove_dep org.zanata:stub-server client/zanata-rest-client -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-rest-client -%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-rest-client -%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client/zanata-rest-client %pom_remove_plugin :duplicate-finder-maven-plugin client/zanata-rest-client -%mvn_artifact client/zanata-rest-client/pom.xml client/zanata-rest-client/target/zanata-rest-client-%{version}.jar ## command -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-client-commands -#%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-client-commands +#%pom_remove_dep :zanata-common-api client/zanata-client-commands +#%pom_remove_dep :zanata-common-util client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-glossary client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-po client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-properties client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-xliff client/zanata-client-commands +#%pom_remove_dep :zanata-rest-client client/zanata-client-commands %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/zanata-client-commands -#%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided client/zanata-common-commands %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client/zanata-client-commands rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/*.java @@ -272,15 +285,15 @@ rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/init/* rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/*.java rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/*.java -%mvn_artifact client/zanata-client-commands/pom.xml client/zanata-client-commands/target/zanata-client-commands-%{version}.jar ## remove SupressFBWarnings, because Fedora does not have edu.umd.cs.findbugs.annotations.SuppressFBWarnings sed -i -e 's/import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;.*$//' client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java sed -i -e 's/(a)SuppressFBWarnings.*$//' client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java +%mvn_artifact client/zanata-client-commands/pom.xml client/zanata-client-commands/target/zanata-client-commands-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/zanata-client-commands ## cli ## No need to generate tarball, thus remove assembly-plugin -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-cli #%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-cli %pom_remove_plugin :appassembler-maven-plugin client/zanata-cli %pom_remove_plugin :maven-assembly-plugin client/zanata-cli @@ -292,6 +305,7 @@ rm client/zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java rm client/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java %mvn_artifact client/zanata-cli/pom.xml client/zanata-cli/target/zanata-cli-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/zanata-cli ## zanata-maven-plugin # zanata-maven-plugin depends on com.pyx4j:maven-plugin-log4j, @@ -303,13 +317,7 @@ rm client/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java %pom_disable_module server %build -# Don't install here, it seems takari produces many duplicates in xmvn-reactor -# Skip the test compile for build tools to avoid Jenkinsfile unit tests -#%mvn_build -i -G -- %{mvn_build_opts} -Dmaven.test.skip -pl build-tools,parent,api,api/zanata-common-api -# Build the rest with unit tests, for it is used to build command lines -#%mvn_build -i -G -- %{mvn_build_opts} -pl '!build-tools,!parent,!api,!api/zanata-common-api' -%mvn_build -i -G -- %{mvn_build_opts} - +%mvn_build -i -X -- %{mvn_build_opts} %install %mvn_install -X @@ -325,8 +333,8 @@ for mod in . %{client_sub_modules};do sed -i.bak -e "s|/usr/lib/java/||" $mod/cp.txt sed -i.bak -e "s|-%{version}||" $mod/cp.txt if [ ! $mod = . ];then - echo -e "\n" >> cp.txt - cat $mod/cp.txt >> cp.txt + echo -e "\n" >> cp.txt + cat $mod/cp.txt >> cp.txt fi done sort -u cp.txt > cp-sorted.txt @@ -364,7 +372,7 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %doc client/README.md docs/client/index.md docs/client/configuration.md docs/client/command-hook.md %changelog -* Wed Oct 18 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.3.0-1 +* Tue Oct 31 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.3.0-1 - Upstream update to 4.3.0 * Mon Sep 04 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.4-1 https://src.fedoraproject.org/rpms/zanata-platform/c/305e31f9df9422d17a75cc…

1 0

dchen pushed to zanata-platform (f26). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 91d659de5ee01d1be33dd7f6fb40d9e442b9310d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Jul 27 2017 22:39:29 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- diff --git a/zanata-platform.spec b/zanata-platform.spec index d2d64ab..72c861a 100644 --- a/zanata-platform.spec +++ b/zanata-platform.spec @@ -12,7 +12,7 @@ Name: zanata-platform Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata the web-based translation platform Group: Development/Tools @@ -331,6 +331,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %doc client/README.txt docs/client/index.md docs/client/configuration.md docs/client/command-hook.md %changelog +* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 02 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.1-1 - Upstream update to 4.2.1 https://src.fedoraproject.org/rpms/zanata-platform/c/91d659de5ee01d1be33dd7…

1 0

tdawson pushed to python-pytest-multihost (master). "Cleanup spec file conditionals"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 40ce52fadede052e7c406e048f3f7c110250338f Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Oct 31 2017 21:26:38 +0000 Subject: Cleanup spec file conditionals --- diff --git a/python-pytest-multihost.spec b/python-pytest-multihost.spec index ff782ad..6da395e 100644 --- a/python-pytest-multihost.spec +++ b/python-pytest-multihost.spec @@ -1,4 +1,4 @@ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 %global with_python3 0 %else %global with_python3 1 @@ -17,7 +17,7 @@ Name: python-%{srcname} Version: %{srcversion} -Release: 7%{?dist} +Release: 8%{?dist} Summary: Utility for writing multi-host tests for pytest License: GPLv3+ @@ -52,7 +52,7 @@ Requires: python2-pytest >= 2.4.0 # Should use python_provide macros, but those won't work in older EPEL Provides: python2-%{srcname} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 # These are not *strictly* required, but are part of the default workflow. Requires: PyYAML Requires: python-paramiko @@ -145,6 +145,9 @@ popd %changelog +* Tue Oct 31 2017 Troy Dawson <tdawson(a)redhat.com> - 1.1-8 +- Cleanup spec file conditionals + * Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild https://src.fedoraproject.org/rpms/python-pytest-multihost/c/40ce52fadede05…

1 0

merlinm pushed to bootstrap (master). "Updating PyQt4, docbook-dtds, gcc, hiredis, python3, qt-mobility, sgml-common (..more)"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 9d5a8a20289162520e55b76fbb27035404cfa11c Mon Sep 17 00:00:00 2001 From: Merlin Mathesius <mmathesi(a)redhat.com> Date: Oct 31 2017 21:20:10 +0000 Subject: Updating PyQt4, docbook-dtds, gcc, hiredis, python3, qt-mobility, sgml-common Signed-off-by: Merlin Mathesius <mmathesi(a)redhat.com> --- diff --git a/bootstrap.yaml b/bootstrap.yaml index 8cc8865..b6a251c 100644 --- a/bootstrap.yaml +++ b/bootstrap.yaml @@ -168,11 +168,11 @@ data: rationale: >- Autogenerated by Host & Platform tooling. ref: 4ac14dea5438e62de7b79f91d6cfaf0335f1cbd6 - # PyQt4-4.12.1-4.fc27 + # PyQt4-4.12.1-5.fc28 PyQt4: rationale: >- Autogenerated by Host & Platform tooling. - ref: 700c05f128dc662f9a6e973e96bb10af3ea32a4f + ref: a0573dff15eae1d7f5bfa98b4ed2a9274759fb7b # PyYAML-3.12-8.fc28 PyYAML: rationale: >- @@ -1954,11 +1954,11 @@ data: rationale: >- Autogenerated by Host & Platform tooling. ref: 81f0dbf8281bbb9e30d213018dd520f2a5d18ba5 - # docbook-dtds-1.0-67.fc27 + # docbook-dtds-1.0-68.fc28 docbook-dtds: rationale: >- Autogenerated by Host & Platform tooling. - ref: 1b7b578b7d8f1080188021e469716af2731fb149 + ref: 14932646578f5b96446d0babbcefab9f7402e005 # docbook-style-dsssl-1.79-24.fc27 docbook-style-dsssl: rationale: >- @@ -2879,11 +2879,11 @@ data: rationale: >- Autogenerated by Host & Platform tooling. ref: d3ad3509918274090df23c34fd736ded6f053c96 - # gcc-7.1.1-7.fc27.1 + # gcc-7.2.1-2.fc27 gcc: rationale: >- Autogenerated by Host & Platform tooling. - ref: 23f4b29ddd1324d32f170995975ce4ba2150bf1b + ref: 553b93f777d042d5c9b316323e518c435c8c8910 # gcr-3.20.0-6.fc27 gcr: rationale: >- @@ -4394,11 +4394,11 @@ data: rationale: >- Autogenerated by Host & Platform tooling. ref: 5ae6beec06b2dd420a1e2921bcfc091163c6a182 - # hiredis-0.13.3-5.fc27 + # hiredis-0.13.3-6.fc28 hiredis: rationale: >- Autogenerated by Host & Platform tooling. - ref: 8c0acb881fe674296d027bd236b2a5f87eced15d + ref: df6ba84fb3379a1d84d093010a1ac01826d737c4 # hivex-1.3.14-8.fc27 hivex: rationale: >- @@ -16762,7 +16762,7 @@ data: python3: rationale: >- Autogenerated by Host & Platform tooling. - ref: b7855d36446510a3c4ec7ef746ea9a365bd5dd3c + ref: f27-modular-server # python3-mallard-ducktype-0.2-8.fc27 python3-mallard-ducktype: rationale: >- @@ -16873,11 +16873,11 @@ data: rationale: >- Autogenerated by Host & Platform tooling. ref: f2ae4342de66f37a894b3a271eb8dfa9c60cbba7 - # qt-mobility-1.2.2-0.26.20140317git169da60c.fc26 + # qt-mobility-1.2.2-0.29.20140317git169da60c.fc28 qt-mobility: rationale: >- Autogenerated by Host & Platform tooling. - ref: 53b7392f48e812fce9be2a4dc816d729d18ec855 + ref: 415045f88a76ed7337357108ae13999598585384 # qt3-3.3.8b-71.fc27 qt3: rationale: >- @@ -18238,11 +18238,11 @@ data: rationale: >- Autogenerated by Host & Platform tooling. ref: 3be4780d1701a168ff858d9e6e23d86752313707 - # sgml-common-0.6.3-46.fc27 + # sgml-common-0.6.3-47.fc28 sgml-common: rationale: >- Autogenerated by Host & Platform tooling. - ref: 244cf59c28d5ebaace902a5c80ffc1eff3c54734 + ref: 8ab6c4bd5da16c4fc173e09be976e738fc5160cb # sgpio-1.2.0.10-19.fc27 sgpio: rationale: >- https://src.fedoraproject.org/modules/bootstrap/c/9d5a8a20289162520e55b76fb…

1 0

andreamanzi pushed to pakiti (el6). "new upstream release"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 6b86dce5944c42dd3f6d747946fb01003f9b7dc9 Mon Sep 17 00:00:00 2001 From: andreamanzi <andrea.manzi(a)gmail.com> Date: Oct 31 2017 21:16:59 +0000 Subject: new upstream release --- diff --git a/pakiti.spec b/pakiti.spec index aee2d0e..7fd207e 100644 --- a/pakiti.spec +++ b/pakiti.spec @@ -12,9 +12,6 @@ License: ASL 2.0 and BSD Group: Applications/Internet Source0: %{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: perl-interpreter -BuildRequires: perl-generators -BuildRequires: /usr/bin/pod2man BuildRequires: perl(File::Temp) BuildRequires: perl(FindBin) https://src.fedoraproject.org/rpms/pakiti/c/6b86dce5944c42dd3f6d747946fb010…

1 0

tdawson pushed to python-pytest-sourceorder (master). "Cleanup spec file conditionals"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 9acbf7e015250ec021de52d0620bfaebbf93dad3 Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Oct 31 2017 21:12:01 +0000 Subject: Cleanup spec file conditionals --- diff --git a/python-pytest-sourceorder.spec b/python-pytest-sourceorder.spec index 6035563..6b143fd 100644 --- a/python-pytest-sourceorder.spec +++ b/python-pytest-sourceorder.spec @@ -1,4 +1,4 @@ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 %global with_python3 0 %else %global with_python3 1 @@ -17,7 +17,7 @@ Name: python-%{srcname} Version: %{srcversion} -Release: 7%{?dist} +Release: 8%{?dist} Summary: Test-ordering plugin for pytest License: GPLv3+ @@ -48,7 +48,7 @@ Summary: Utility for writing multi-host tests for pytest Requires: python2 Requires: python2-pytest >= 2.4.0 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 # These are not *strictly* required, but are part of the default workflow. Requires: PyYAML Requires: python2-paramiko @@ -68,7 +68,7 @@ Summary: Test-ordering plugin for pytest Requires: python3 Requires: python3-pytest -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 # These are not *strictly* required, but are part of the default workflow. Recommends: python3-PyYAML Recommends: python3-paramiko @@ -147,6 +147,9 @@ popd %changelog +* Tue Oct 31 2017 Troy Dawson <tdawson(a)redhat.com> - 0.5-8 +- Cleanup spec file conditionals + * Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild https://src.fedoraproject.org/rpms/python-pytest-sourceorder/c/9acbf7e01525…

1 0

andreamanzi pushed to pakiti (el6). "new upstream release"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 8401f712787b5a82c0165536d90e6f3f5698c390 Mon Sep 17 00:00:00 2001 From: andreamanzi <andrea.manzi(a)gmail.com> Date: Oct 31 2017 20:56:56 +0000 Subject: new upstream release --- diff --git a/pakiti.spec b/pakiti.spec index 91f0438..af56887 100644 --- a/pakiti.spec +++ b/pakiti.spec @@ -40,7 +40,7 @@ Runs rpm -qa or dpkg -l, depends on the linux distro. Results are sent to the central Pakiti server using openssl s_client or curl. %prep -%setup -qn %{github_name}-%{commit} +%setup -qn %{name}-%{version} %build make https://src.fedoraproject.org/rpms/pakiti/c/8401f712787b5a82c0165536d90e6f3…

1 0

andreamanzi pushed to pakiti (el6). "new upstream release"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 03c8446c855b1c9ad0c683d57b0515a4bba66f4b Mon Sep 17 00:00:00 2001 From: andreamanzi <andrea.manzi(a)gmail.com> Date: Oct 31 2017 21:03:24 +0000 Subject: new upstream release --- diff --git a/pakiti.spec b/pakiti.spec index af56887..aee2d0e 100644 --- a/pakiti.spec +++ b/pakiti.spec @@ -50,11 +50,10 @@ install -D -m755 bin/pakiti-client %{buildroot}%{_bindir}/pakiti-client install -D -m644 pakiti-client.1 %{buildroot}%{_mandir}/man1/pakiti-client.1 %files client -%license LICENSE +%defattr(-,root,root,-) %{_bindir}/* %{_mandir}/man?/* - %changelog * Tue Oct 31 2017 Andrea Manzi <amanzi(a)cern.ch> - 3.0.2-1 - new upstream release https://src.fedoraproject.org/rpms/pakiti/c/03c8446c855b1c9ad0c683d57b0515a…

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits October 2017